Hello community,
here is the log from the commit of package python-oslo.sphinx for openSUSE:13.1 checked in at 2013-10-02 13:33:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/python-oslo.sphinx (Old)
and /work/SRC/openSUSE:13.1/.python-oslo.sphinx.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslo.sphinx"
Changes:
--------
--- /work/SRC/openSUSE:13.1/python-oslo.sphinx/python-oslo.sphinx.changes 2013-09-23 11:06:46.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.python-oslo.sphinx.new/python-oslo.sphinx.changes 2013-10-02 13:33:14.000000000 +0200
@@ -1,0 +2,41 @@
+Tue Oct 1 10:36:59 UTC 2013 - speilicke@suse.com
+
+- Provide/obsolete doc and test sub-packages
+
+-------------------------------------------------------------------
+Sat Sep 21 00:11:00 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 1.0.10:
+ + Update build config
+
+-------------------------------------------------------------------
+Thu Sep 19 00:15:21 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 1.0.8:
+ + Update pbr usage past needing d2to1
+ + Add namespace_packages to setup.cfg
+
+-------------------------------------------------------------------
+Fri Jul 19 20:41:12 UTC 2013 - dmueller@suse.com
+
+- remove doc subpackage
+
+-------------------------------------------------------------------
+Mon Jul 15 23:58:04 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 1.0.4:
+ + Add an OpenStack-wide intersphinx mapping file
+
+-------------------------------------------------------------------
+Fri Jul 12 23:36:26 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 1.0.3:
+ + Add emacs save files to gitignore
+ + Ensure that AUTHORS and ChangeLog are packaged
+
+-------------------------------------------------------------------
+Fri Jul 12 07:26:56 UTC 2013 - dmueller@suse.com
+
+- drop -test subpackage
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-oslo.sphinx.spec ++++++
--- /var/tmp/diff_new_pack.EN2cIU/_old 2013-10-02 13:33:14.000000000 +0200
+++ /var/tmp/diff_new_pack.EN2cIU/_new 2013-10-02 13:33:14.000000000 +0200
@@ -19,7 +19,7 @@
%define component oslo
Name: python-oslo.sphinx
-Version: 1.0.1
+Version: 1.0.10
Release: 0
Url: https://launchpad.net/oslo/
Summary: OpenStack Sphinx
@@ -33,13 +33,13 @@
BuildRequires: python-base
BuildRequires: python-d2to1
BuildRequires: python-pbr
+BuildRequires: python-setuptools
Requires: python-d2to1
-Requires: python-iso8601
Requires: python-pbr
-Requires: python-six
-Requires: python-stevedore
-Provides: python-oslo-config = 2013.2
-Obsoletes: python-oslo-config < 2013.2
+Provides: %{name}-doc = %{version}
+Obsoletes: %{name}-doc < %{version}
+Provides: %{name}-test = %{version}
+Obsoletes: %{name}-test < %{version}
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%else
@@ -50,53 +50,15 @@
The Oslo Sphinx library provides an OpenStack common
layer of Sphinx plugins.
-%package doc
-Summary: OpenStack Sphinx - Documentation
-Group: Documentation/HTML
-Requires: %{name} = %{version}
-BuildRequires: python-Sphinx
-Provides: python-oslo-config-doc = 2013.2
-Obsoletes: python-oslo-config-doc < 2013.2
-
-%description doc
-This package contains documentation files for %{name}.
-
-%package test
-Summary: OpenStack Sphinx - test suite
-Group: System/Management
-Conflicts: python-oslo-config-test
-Requires: %{name} = %{version}
-Requires: python-coverage
-%if 0%{?suse_version} && 0%{?suse_version} <= 1110
-Requires: python-discover
-%endif
-Requires: python-fixtures >= 0.3.12
-Requires: python-flake8 >= 2.0
-Requires: python-hacking >= 0.5.3
-Requires: python-pep8 >= 1.4.5
-Requires: python-pyflakes >= 0.7.2
-Requires: python-python-subunit
-Requires: python-testrepository >= 0.0.13
-Requires: python-testtools >= 0.9.29
-
-%description test
-This package contains testsuite files for %{name}.
-
%prep
-%setup -q -n oslo.sphinx-1.0.1.g4e2051a
+%setup -q -n oslo.sphinx-1.0.10.g8e15299
%build
python setup.py build
-#python setup.py build_sphinx
%install
python setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix} --install-data=%{python_sitelib}
-#rm -rf doc/build/html/{.buildinfo,.doctrees}
-#%fdupes doc
-
-%openstack_test_package_install
-
%files
%defattr(-,root,root,-)
%doc LICENSE README.rst AUTHORS
@@ -104,13 +66,4 @@
%{python_sitelib}/*.egg-info
%{python_sitelib}/*nspkg.pth
-%files doc
-%defattr(-,root,root,-)
-%doc LICENSE
-#%doc doc/build/html
-
-%files test
-%defattr(-,root,root,-)
-%{_localstatedir}/lib/%{name}-test/
-
%changelog
++++++ oslo.sphinx-master.tar.gz ++++++
Files old/oslo.sphinx-1.0.1.g4e2051a/.MANIFEST.in.un~ and new/oslo.sphinx-1.0.10.g8e15299/.MANIFEST.in.un~ differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/.gitignore new/oslo.sphinx-1.0.10.g8e15299/.gitignore
--- old/oslo.sphinx-1.0.1.g4e2051a/.gitignore 2013-07-05 19:09:38.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-*.pyc
-*.dat
-TAGS
-*.egg-info
-build
-.coverage
-.tox
-cover
-.testrepository
-subunit.log
-AUTHORS
-ChangeLog
-*.deb
-dist
-*.egg
-ceilometer/versioninfo
-doc/source/api/ceilometer.*.rst
-doc/source/api/tests.*.rst
-doc/source/api/autoindex.rst
-doc/source/sourcecode
-*.mo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/.gitreview new/oslo.sphinx-1.0.10.g8e15299/.gitreview
--- old/oslo.sphinx-1.0.1.g4e2051a/.gitreview 2013-06-30 19:47:05.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/.gitreview 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-[gerrit]
-host=review.openstack.org
-port=29418
-project=openstack/oslo.sphinx.git
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/AUTHORS new/oslo.sphinx-1.0.10.g8e15299/AUTHORS
--- old/oslo.sphinx-1.0.1.g4e2051a/AUTHORS 2013-07-08 11:07:24.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/AUTHORS 2013-09-20 17:27:32.000000000 +0200
@@ -0,0 +1,6 @@
+Dirk Mueller
+Doug Hellmann
+Julien Danjou
+Mark McLoughlin
+Monty Taylor
+Sergey Lukjanov
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/ChangeLog new/oslo.sphinx-1.0.10.g8e15299/ChangeLog
--- old/oslo.sphinx-1.0.1.g4e2051a/ChangeLog 2013-07-08 11:07:26.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/ChangeLog 2013-09-20 17:27:32.000000000 +0200
@@ -0,0 +1,125 @@
+commit 8e152992d4b634e8e346ee6271bf73f579807306
+Merge: d4b06ba 6a71811
+Author: Jenkins
+Date: Fri Sep 20 15:27:24 2013 +0000
+
+ Merge "Update build config"
+
+commit 6a71811cd733224c7dfb0ed7c5c8f155cfe58976
+Author: Monty Taylor
+Date: Thu Sep 19 07:36:45 2013 -0700
+
+ Update build config
+
+ Use latest pbr things that don't require pbr. Also update the tox config
+ to ensure venv is updated properly.
+
+ Change-Id: I157127abd129bbe085c64e2a14f67296da0c4b5e
+
+commit d4b06bab5659926ac8219f750361be4a5158420a
+Author: Mark McLoughlin
+Date: Wed Sep 18 07:48:56 2013 -0700
+
+ Add namespace_packages to setup.cfg
+
+ We lost this when switching to latest pbr.
+
+ Thanks to dprince for catching this in Smokestack.
+
+ Change-Id: Ideb3f9750269d825f380351c3bbbbf743bff08ba
+
+commit c89928aaa02d6f84d2edabda246812f0976e6640
+Author: Monty Taylor
+Date: Fri Sep 13 11:33:49 2013 -0500
+
+ Update pbr usage past needing d2to1
+
+ Change-Id: Ia5c8dd9259e8098c2ad39eda6fc44c6db81944ad
+
+commit f296853bedb92c3faded41790a05c203f41e9732
+Author: Julien Danjou
+Date: Thu Jul 25 16:09:18 2013 +0200
+
+ Remove useless jquery.tweet.js
+
+ This file exports a jQuery tweet function, but it's never called anywhere in
+ the theme.
+
+ Change-Id: Ie5191940a8e9dc3e2562888d050cd00dc63066d8
+
+commit 9f34799a2c9880fce18d3f89033caa968cfd7ad1
+Author: Sergey Lukjanov
+Date: Sat Jul 20 00:48:36 2013 +0400
+
+ Allow use of hacking 0.6.0 and fix min version
+
+ Change-Id: If336be59cf790029b5e24f05074e6ec6e9658134
+
+commit e4b2587d6b7ae2faa8cb9da7039a82705fbb3067
+Author: Monty Taylor
+Date: Fri Jul 5 11:06:22 2013 -0400
+
+ Add an OpenStack-wide intersphinx mapping file
+
+ Change-Id: Id30470132eb9540b6f7fb693fca5ec0cbe2ce49a
+
+commit 9ab5dacf3efbf5c3900176484082edf2623ed638
+Merge: f93071e b139fa8
+Author: Jenkins
+Date: Fri Jul 12 22:45:30 2013 +0000
+
+ Merge "Ensure that AUTHORS and ChangeLog are packaged"
+
+commit b139fa873e35fb4e60333f25b6e548d4a355becc
+Author: Dirk Mueller
+Date: Mon Jul 8 11:04:55 2013 +0200
+
+ Ensure that AUTHORS and ChangeLog are packaged
+
+ Include AUTHORS and ChangeLog from pbr to be included
+ in the sdist tarball. Add a minimal HACKING.rst for
+ consistency with other projects.
+
+ Fixes LP Bug #1186518
+
+ Change-Id: I0f188c1c1b449b74b43296222d33a89f98645950
+
+commit f93071eef0039a570f887bbd2c46324ce75873ce
+Author: Monty Taylor
+Date: Fri Jul 5 11:15:52 2013 -0400
+
+ Add emacs save files to gitignore
+
+ Change-Id: If0accbcc80d9289907d83a9df0e0d0604c11800b
+
+commit 4e2051a422307ee1a9c28cc221fa3ff82d025c0d
+Author: Monty Taylor
+Date: Fri Jul 5 13:04:22 2013 -0400
+
+ Add venv tox env.
+
+ OpenStack CI requires this to generate the tarball.
+
+ Change-Id: I170f4d25e4a59027d4c85ff70f03f31a1b3dc916
+
+commit ac91ff16bc7e0ec7bd9157cef04aae5f5518663a
+Author: Doug Hellmann
+Date: Mon Jul 1 17:32:22 2013 -0400
+
+ Import Sphinx theme for OpenStack
+
+ This is a copy of the Sphinx theme for OpenStack developer
+ documentation imported from the ceilometer repository. After
+ this library is released, we will remove the copies of the
+ theme from all of the other repositories.
+
+ blueprint oslo.sphinx
+
+ Change-Id: I20b6c224b8d8fbede354c2a28ad67eda3a4b9dac
+ Signed-off-by: Doug Hellmann
+
+commit eca47086d010f519bf7fb32e9c56c79e13c255c9
+Author: OpenStack Project Creator
+Date: Sun Jun 30 17:07:29 2013 +0000
+
+ Added .gitreview
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/HACKING.rst new/oslo.sphinx-1.0.10.g8e15299/HACKING.rst
--- old/oslo.sphinx-1.0.1.g4e2051a/HACKING.rst 1970-01-01 01:00:00.000000000 +0100
+++ new/oslo.sphinx-1.0.10.g8e15299/HACKING.rst 2013-09-20 17:27:25.000000000 +0200
@@ -0,0 +1,16 @@
+OpenStack Style Commandments
+============================
+
+- Step 1: Read http://www.python.org/dev/peps/pep-0008/
+- Step 2: Read http://www.python.org/dev/peps/pep-0008/ again
+- Step 3: Read https://github.com/openstack-dev/hacking/blob/master/HACKING.rst
+
+The OpenStack Style Commandments live here:
+
+ https://github.com/openstack-dev/hacking/blob/master/HACKING.rst
+
+local-checks
+------------
+
+None so far
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/MANIFEST.in new/oslo.sphinx-1.0.10.g8e15299/MANIFEST.in
--- old/oslo.sphinx-1.0.1.g4e2051a/MANIFEST.in 2013-07-08 11:07:45.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/MANIFEST.in 2013-09-20 17:27:25.000000000 +0200
@@ -1,4 +1,4 @@
recursive-include oslo *.html *.css *.js *.conf *.jpg *.gif
include AUTHORS
+include HACKING.rst
include ChangeLog
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/PKG-INFO new/oslo.sphinx-1.0.10.g8e15299/PKG-INFO
--- old/oslo.sphinx-1.0.1.g4e2051a/PKG-INFO 2013-07-05 19:09:45.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/PKG-INFO 2013-09-20 17:27:32.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: oslo.sphinx
-Version: 1.0.1.g4e2051a
+Version: 1.0.10.g8e15299
Summary: OpenStack Sphinx Extensions
Home-page: http://www.openstack.org/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/oslo/sphinx/intersphinx.py new/oslo.sphinx-1.0.10.g8e15299/oslo/sphinx/intersphinx.py
--- old/oslo.sphinx-1.0.1.g4e2051a/oslo/sphinx/intersphinx.py 1970-01-01 01:00:00.000000000 +0100
+++ new/oslo.sphinx-1.0.10.g8e15299/oslo/sphinx/intersphinx.py 2013-09-20 17:27:25.000000000 +0200
@@ -0,0 +1,71 @@
+# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Intersphinx mapping file for the OpenStack projects.
+
+To use this mapping in a project, first add 'sphinx.ext.intersphinx' to
+your extensions list in conf.py. Then::
+
+ from oslo.sphinx import intersphinx
+ intersphinx_mapping = intersphinx.mapping
+
+You'll be able to link to other project's documentation, such as:
+
+ :ref:`virtual-environments nova:virtual-environments`
+"""
+
+mapping = dict(
+ # OpenStack Projects
+ ceilometer=('http://docs.openstack.org/developer/ceilometer/', None),
+ cinder=('http://docs.openstack.org/developer/cinder/', None),
+ glance=('http://docs.openstack.org/developer/glance/', None),
+ heat=('http://docs.openstack.org/developer/heat/', None),
+ horizon=('http://docs.openstack.org/developer/horizon/', None),
+ ironic=('http://docs.openstack.org/developer/ironic/', None),
+ keystone=('http://docs.openstack.org/developer/keystone/', None),
+ nova=('http://docs.openstack.org/developer/nova/', None),
+ oslo_config=('http://docs.openstack.org/developer/oslo.config/', None),
+ oslo_messaging=(
+ 'http://docs.openstack.org/developer/oslo.messaging/', None),
+ ceilometerclient=(
+ 'http://docs.openstack.org/developer/python-ceilometerclient/', None),
+ cinderclient=(
+ 'http://docs.openstack.org/developer/python-cinderclient/', None),
+ glanceclient=(
+ 'http://docs.openstack.org/developer/python-glanceclient/', None),
+ heatclient=(
+ 'http://docs.openstack.org/developer/python-heatclient/', None),
+ ironicclient=(
+ 'http://docs.openstack.org/developer/python-ironicclient/', None),
+ keystoneclient=(
+ 'http://docs.openstack.org/developer/python-keystoneclient/', None),
+ novaclient=(
+ 'http://docs.openstack.org/developer/python-novaclient/', None),
+ openstackclient=(
+ 'http://docs.openstack.org/developer/python-openstackclient/', None),
+ quantumclient=(
+ 'http://docs.openstack.org/developer/python-swiftclient/', None),
+ swiftclient=(
+ 'http://docs.openstack.org/developer/python-swiftclient/', None),
+ troveclient=(
+ 'http://docs.openstack.org/developer/python-troveclient/', None),
+ quantum=('http://docs.openstack.org/developer/quantum/', None),
+ swift=('http://docs.openstack.org/developer/swift/', None),
+ trove=('http://docs.openstack.org/developer/trove/', None),
+ # Other things of note
+ python=('http://docs.python.org/', None),
+ infra=('http://ci.openstack.org/', None),
+ zuul=('http://ci.openstack.org/zuul/', None),
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/oslo/sphinx/theme/openstack/layout.html new/oslo.sphinx-1.0.10.g8e15299/oslo/sphinx/theme/openstack/layout.html
--- old/oslo.sphinx-1.0.1.g4e2051a/oslo/sphinx/theme/openstack/layout.html 2013-07-05 19:09:38.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/oslo/sphinx/theme/openstack/layout.html 2013-09-20 17:27:25.000000000 +0200
@@ -1,6 +1,5 @@
{% extends "basic/layout.html" %}
{% set css_files = css_files + ['_static/tweaks.css'] %}
-{% set script_files = script_files + ['_static/jquery.tweet.js'] %}
{%- macro sidebar() %}
{%- if not embedded %}{% if not theme_nosidebar|tobool %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/oslo/sphinx/theme/openstack/static/jquery.tweet.js new/oslo.sphinx-1.0.10.g8e15299/oslo/sphinx/theme/openstack/static/jquery.tweet.js
--- old/oslo.sphinx-1.0.1.g4e2051a/oslo/sphinx/theme/openstack/static/jquery.tweet.js 2013-07-05 19:09:38.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/oslo/sphinx/theme/openstack/static/jquery.tweet.js 1970-01-01 01:00:00.000000000 +0100
@@ -1,154 +0,0 @@
-(function($) {
-
- $.fn.tweet = function(o){
- var s = {
- username: ["seaofclouds"], // [string] required, unless you want to display our tweets. :) it can be an array, just do ["username1","username2","etc"]
- list: null, //[string] optional name of list belonging to username
- avatar_size: null, // [integer] height and width of avatar if displayed (48px max)
- count: 3, // [integer] how many tweets to display?
- intro_text: null, // [string] do you want text BEFORE your your tweets?
- outro_text: null, // [string] do you want text AFTER your tweets?
- join_text: null, // [string] optional text in between date and tweet, try setting to "auto"
- auto_join_text_default: "i said,", // [string] auto text for non verb: "i said" bullocks
- auto_join_text_ed: "i", // [string] auto text for past tense: "i" surfed
- auto_join_text_ing: "i am", // [string] auto tense for present tense: "i was" surfing
- auto_join_text_reply: "i replied to", // [string] auto tense for replies: "i replied to" @someone "with"
- auto_join_text_url: "i was looking at", // [string] auto tense for urls: "i was looking at" http:...
- loading_text: null, // [string] optional loading text, displayed while tweets load
- query: null // [string] optional search query
- };
-
- if(o) $.extend(s, o);
-
- $.fn.extend({
- linkUrl: function() {
- var returning = [];
- var regexp = /((ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
- this.each(function() {
- returning.push(this.replace(regexp,"$1</a>"));
- });
- return $(returning);
- },
- linkUser: function() {
- var returning = [];
- var regexp = /[\@]+([A-Za-z0-9-_]+)/gi;
- this.each(function() {
- returning.push(this.replace(regexp,"http://twitter.com/$1\">@$1</a>"));
- });
- return $(returning);
- },
- linkHash: function() {
- var returning = [];
- var regexp = / [\#]+([A-Za-z0-9-_]+)/gi;
- this.each(function() {
- returning.push(this.replace(regexp, ' http://search.twitter.com/search?q=&tag=$1&lang=all&from='+s.username.join("%2BOR%2B")+'">#$1</a>'));
- });
- return $(returning);
- },
- capAwesome: function() {
- var returning = [];
- this.each(function() {
- returning.push(this.replace(/\b(awesome)\b/gi, '<span class="awesome">$1</span>'));
- });
- return $(returning);
- },
- capEpic: function() {
- var returning = [];
- this.each(function() {
- returning.push(this.replace(/\b(epic)\b/gi, '<span class="epic">$1</span>'));
- });
- return $(returning);
- },
- makeHeart: function() {
- var returning = [];
- this.each(function() {
- returning.push(this.replace(/(<)+[3]/gi, "<tt class='heart'>♥</tt>"));
- });
- return $(returning);
- }
- });
-
- function relative_time(time_value) {
- var parsed_date = Date.parse(time_value);
- var relative_to = (arguments.length > 1) ? arguments[1] : new Date();
- var delta = parseInt((relative_to.getTime() - parsed_date) / 1000);
- var pluralize = function (singular, n) {
- return '' + n + ' ' + singular + (n == 1 ? '' : 's');
- };
- if(delta < 60) {
- return 'less than a minute ago';
- } else if(delta < (45*60)) {
- return 'about ' + pluralize("minute", parseInt(delta / 60)) + ' ago';
- } else if(delta < (24*60*60)) {
- return 'about ' + pluralize("hour", parseInt(delta / 3600)) + ' ago';
- } else {
- return 'about ' + pluralize("day", parseInt(delta / 86400)) + ' ago';
- }
- }
-
- function build_url() {
- var proto = ('https:' == document.location.protocol ? 'https:' : 'http:');
- if (s.list) {
- return proto+"//api.twitter.com/1/"+s.username[0]+"/lists/"+s.list+"/statuses.json?per_page="+s.count+"&callback=?";
- } else if (s.query == null && s.username.length == 1) {
- return proto+'//twitter.com/status/user_timeline/'+s.username[0]+'.json?count='+s.count+'&callback=?';
- } else {
- var query = (s.query || 'from:'+s.username.join('%20OR%20from:'));
- return proto+'//search.twitter.com/search.json?&q='+query+'&rpp='+s.count+'&callback=?';
- }
- }
-
- return this.each(function(){
- var list = $('<ul class="tweet_list">').appendTo(this);
- var intro = '<p class="tweet_intro">'+s.intro_text+'</p>';
- var outro = '<p class="tweet_outro">'+s.outro_text+'</p>';
- var loading = $('<p class="loading">'+s.loading_text+'</p>');
-
- if(typeof(s.username) == "string"){
- s.username = [s.username];
- }
-
- if (s.loading_text) $(this).append(loading);
- $.getJSON(build_url(), function(data){
- if (s.loading_text) loading.remove();
- if (s.intro_text) list.before(intro);
- $.each((data.results || data), function(i,item){
- // auto join text based on verb tense and content
- if (s.join_text == "auto") {
- if (item.text.match(/^(@([A-Za-z0-9-_]+)) .*/i)) {
- var join_text = s.auto_join_text_reply;
- } else if (item.text.match(/(^\w+:\/\/[A-Za-z0-9-_]+\.[A-Za-z0-9-_:%&\?\/.=]+) .*/i)) {
- var join_text = s.auto_join_text_url;
- } else if (item.text.match(/^((\w+ed)|just) .*/im)) {
- var join_text = s.auto_join_text_ed;
- } else if (item.text.match(/^(\w*ing) .*/i)) {
- var join_text = s.auto_join_text_ing;
- } else {
- var join_text = s.auto_join_text_default;
- }
- } else {
- var join_text = s.join_text;
- };
-
- var from_user = item.from_user || item.user.screen_name;
- var profile_image_url = item.profile_image_url || item.user.profile_image_url;
- var join_template = '<span class="tweet_join"> '+join_text+' </span>';
- var join = ((s.join_text) ? join_template : ' ');
- var avatar_template = '<a class="tweet_avatar" href="http://twitter.com/'+from_user+'"><img src="'+profile_image_url+'" height="'+s.avatar_size+'" width="'+s.avatar_size+'" alt="'+from_user+'\'s avatar" title="'+from_user+'\'s avatar" border="0"/></a>';
- var avatar = (s.avatar_size ? avatar_template : '');
- var date = '<a href="http://twitter.com/'+from_user+'/statuses/'+item.id+'" title="view tweet on twitter">'+relative_time(item.created_at)+'</a>';
- var text = '<span class="tweet_text">' +$([item.text]).linkUrl().linkUser().linkHash().makeHeart().capAwesome().capEpic()[0]+ '</span>';
-
- // until we create a template option, arrange the items below to alter a tweet's display.
- list.append('<li>' + avatar + date + join + text + '</li>');
-
- list.children('li:first').addClass('tweet_first');
- list.children('li:odd').addClass('tweet_even');
- list.children('li:even').addClass('tweet_odd');
- });
- if (s.outro_text) list.after(outro);
- });
-
- });
- };
-})(jQuery);
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/oslo.sphinx.egg-info/PKG-INFO new/oslo.sphinx-1.0.10.g8e15299/oslo.sphinx.egg-info/PKG-INFO
--- old/oslo.sphinx-1.0.1.g4e2051a/oslo.sphinx.egg-info/PKG-INFO 2013-07-05 19:09:45.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/oslo.sphinx.egg-info/PKG-INFO 2013-09-20 17:27:32.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: oslo.sphinx
-Version: 1.0.1.g4e2051a
+Version: 1.0.10.g8e15299
Summary: OpenStack Sphinx Extensions
Home-page: http://www.openstack.org/
Author: OpenStack
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/oslo.sphinx.egg-info/SOURCES.txt new/oslo.sphinx-1.0.10.g8e15299/oslo.sphinx.egg-info/SOURCES.txt
--- old/oslo.sphinx-1.0.1.g4e2051a/oslo.sphinx.egg-info/SOURCES.txt 2013-07-05 19:09:45.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/oslo.sphinx.egg-info/SOURCES.txt 2013-09-20 17:27:32.000000000 +0200
@@ -1,5 +1,6 @@
-.gitignore
-.gitreview
+AUTHORS
+ChangeLog
+HACKING.rst
LICENSE
MANIFEST.in
README.rst
@@ -16,13 +17,13 @@
oslo.sphinx.egg-info/not-zip-safe
oslo.sphinx.egg-info/top_level.txt
oslo/sphinx/__init__.py
+oslo/sphinx/intersphinx.py
oslo/sphinx/theme/openstack/layout.html
oslo/sphinx/theme/openstack/theme.conf
oslo/sphinx/theme/openstack/static/basic.css
oslo/sphinx/theme/openstack/static/default.css
oslo/sphinx/theme/openstack/static/header-line.gif
oslo/sphinx/theme/openstack/static/header_bg.jpg
-oslo/sphinx/theme/openstack/static/jquery.tweet.js
oslo/sphinx/theme/openstack/static/nature.css
oslo/sphinx/theme/openstack/static/openstack_logo.png
oslo/sphinx/theme/openstack/static/tweaks.css
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/setup.cfg new/oslo.sphinx-1.0.10.g8e15299/setup.cfg
--- old/oslo.sphinx-1.0.1.g4e2051a/setup.cfg 2013-07-05 19:09:45.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/setup.cfg 2013-09-20 17:27:32.000000000 +0200
@@ -26,6 +26,8 @@
packages =
oslo
oslo.sphinx
+namespace_packages =
+ oslo
[build_sphinx]
all_files = 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/setup.py new/oslo.sphinx-1.0.10.g8e15299/setup.py
--- old/oslo.sphinx-1.0.1.g4e2051a/setup.py 2013-07-05 19:09:38.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/setup.py 2013-09-20 17:27:25.000000000 +0200
@@ -14,12 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
import setuptools
setuptools.setup(
- setup_requires=['d2to1>=0.2.10,<0.3', 'pbr>=0.5,<0.6'],
- d2to1=True,
- namespace_packages=['oslo'],
- packages=['oslo', 'oslo.sphinx'],
- zip_safe=False,
-)
+ setup_requires=['pbr'],
+ pbr=True)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/test-requirements.txt new/oslo.sphinx-1.0.10.g8e15299/test-requirements.txt
--- old/oslo.sphinx-1.0.1.g4e2051a/test-requirements.txt 2013-07-05 19:09:38.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/test-requirements.txt 2013-09-20 17:27:25.000000000 +0200
@@ -0,0 +1 @@
+hacking>=0.5.6,<0.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslo.sphinx-1.0.1.g4e2051a/tox.ini new/oslo.sphinx-1.0.10.g8e15299/tox.ini
--- old/oslo.sphinx-1.0.1.g4e2051a/tox.ini 2013-07-05 19:09:38.000000000 +0200
+++ new/oslo.sphinx-1.0.10.g8e15299/tox.ini 2013-09-20 17:27:25.000000000 +0200
@@ -1,7 +1,11 @@
[tox]
+minversion = 1.6
+skipsdist = True
envlist = pep8
[testenv]
+usedevelop = True
+install_command = pip install {opts} {packages}
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
setenv = VIRTUAL_ENV={envdir}
@@ -9,11 +13,6 @@
downloadcache = {toxworkdir}/_download
[testenv:pep8]
-# Install bounded pep8/pyflakes first, then let flake8 install
-deps = pep8==1.4.5
- pyflakes==0.7.2
- flake8==2.0
- hacking>=0.5.3,<0.6
commands =
flake8 oslo
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org