Hello community, here is the log from the commit of package python-oslosphinx for openSUSE:Factory checked in at 2016-09-30 15:29:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-oslosphinx (Old) and /work/SRC/openSUSE:Factory/.python-oslosphinx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-oslosphinx" Changes: -------- --- /work/SRC/openSUSE:Factory/python-oslosphinx/python-oslosphinx.changes 2016-05-19 12:14:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslosphinx.new/python-oslosphinx.changes 2016-09-30 15:29:46.000000000 +0200 @@ -1,0 +2,12 @@ +Wed Aug 10 12:10:57 UTC 2016 - tbecht...@suse.com + +- update to 4.7.0: + * Allow "Other Versions" section to be configurable + * Updated from global requirements + * fix other versions sidebar links + * Subprocess returns bytes in py3 + * Updated from global requirements + * add recent versions links to sidebar +- Update _service and switch to upstream spec template + +------------------------------------------------------------------- Old: ---- oslosphinx-4.3.0.tar.gz New: ---- oslosphinx-4.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslosphinx.spec ++++++ --- /var/tmp/diff_new_pack.3b5WA5/_old 2016-09-30 15:29:47.000000000 +0200 +++ /var/tmp/diff_new_pack.3b5WA5/_new 2016-09-30 15:29:47.000000000 +0200 @@ -16,19 +16,21 @@ # +%global sname oslosphinx Name: python-oslosphinx -Version: 4.3.0 +Version: 4.7.0 Release: 0 -Url: https://launchpad.net/oslosphinx Summary: OpenStack Sphinx License: Apache-2.0 Group: Development/Languages/Python -Source: https://pypi.python.org/packages/source/o/oslosphinx/oslosphinx-%{version}.tar.gz +Url: https://launchpad.net/oslosphinx +Source0: https://pypi.io/packages/source/o/%{sname}/%{sname}-%{version}.tar.gz BuildRequires: openstack-macros BuildRequires: python-devel -BuildRequires: python-pbr -Requires: python-pbr >= 1.8 -Requires: python-requests >= 2.8.1 +BuildRequires: python-pbr >= 1.6 +BuildRequires: python-setuptools >= 16.0 +Requires: python-pbr >= 1.6 +Requires: python-requests >= 2.10.0 Requires: python-six >= 1.9.0 BuildArch: noarch @@ -37,19 +39,18 @@ layer of Sphinx plugins. %prep -%setup -q -n oslosphinx-%{version} +%setup -q -n %{sname}-%{version} %build -%{__python2} setup.py build +%{py2_build} %install -%{__python2} setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix} --install-data=%{python2_sitelib} +%{py2_install} %files -%defattr(-,root,root,-) %doc README.rst AUTHORS %license LICENSE -%{python2_sitelib}/oslosphinx +%{python2_sitelib}/%{sname} %{python2_sitelib}/*.egg-info %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3b5WA5/_old 2016-09-30 15:29:47.000000000 +0200 +++ /var/tmp/diff_new_pack.3b5WA5/_new 2016-09-30 15:29:47.000000000 +0200 @@ -1,13 +1,13 @@ <services> - <service mode="disabled" name="download_files"> - <param name="changesgenerate">enable</param> - </service> - <service mode="disabled" name="set_version"> - <param name="basename">oslosphinx</param> + <service mode="disabled" name="renderspec"> + <param name="input-template">https://raw.githubusercontent.com/openstack/rpm-packaging/master/openstack/oslosphinx/oslosphinx.spec.j2</param> + <param name="output-name">python-oslosphinx.spec</param> + <param name="requirements">https://raw.githubusercontent.com/openstack/rpm-packaging/master/global-requirements.txt</param> </service> - <service name="python_requires" mode="disabled"> + <service mode="disabled" name="download_files"> + <param name="changesgenerate">enable</param> </service> <service name="refresh_patches" mode="disabled"> <param name="changesgenerate">enable</param> </service> -</services> +</services> \ No newline at end of file ++++++ oslosphinx-4.3.0.tar.gz -> oslosphinx-4.7.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/AUTHORS new/oslosphinx-4.7.0/AUTHORS --- old/oslosphinx-4.3.0/AUTHORS 2016-02-10 00:18:24.000000000 +0100 +++ new/oslosphinx-4.7.0/AUTHORS 2016-08-02 20:14:38.000000000 +0200 @@ -6,6 +6,7 @@ Cyril Roelandt <cy...@redhat.com> Davanum Srinivas <dava...@gmail.com> Davanum Srinivas <d...@linux.vnet.ibm.com> +David Stanek <dsta...@dstanek.com> Dirk Mueller <d...@dmllr.de> Doug Hellmann <doug.hellm...@dreamhost.com> Doug Hellmann <d...@doughellmann.com> @@ -15,6 +16,8 @@ Javier Pena <jp...@redhat.com> Jeremy Stanley <fu...@yuggoth.org> Joe Gordon <joe.gord...@gmail.com> +John Dickinson <m...@not.mn> +Joshua Harlow <jxhar...@godaddy.com> Julien Danjou <jul...@danjou.info> Mark McLoughlin <mar...@redhat.com> Monty Taylor <mord...@inaugust.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/ChangeLog new/oslosphinx-4.7.0/ChangeLog --- old/oslosphinx-4.3.0/ChangeLog 2016-02-10 00:18:24.000000000 +0100 +++ new/oslosphinx-4.7.0/ChangeLog 2016-08-02 20:14:38.000000000 +0200 @@ -1,6 +1,28 @@ CHANGES ======= +4.7.0 +----- + +* Allow "Other Versions" section to be configurable + +4.6.0 +----- + +* Updated from global requirements +* fix other versions sidebar links + +4.5.0 +----- + +* Subprocess returns bytes in py3 + +4.4.0 +----- + +* Updated from global requirements +* add recent versions links to sidebar + 4.3.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/PKG-INFO new/oslosphinx-4.7.0/PKG-INFO --- old/oslosphinx-4.3.0/PKG-INFO 2016-02-10 00:18:24.000000000 +0100 +++ new/oslosphinx-4.7.0/PKG-INFO 2016-08-02 20:14:38.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslosphinx -Version: 4.3.0 +Version: 4.7.0 Summary: OpenStack Sphinx Extensions and Theme Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/doc/source/usage.rst new/oslosphinx-4.7.0/doc/source/usage.rst --- old/oslosphinx-4.3.0/doc/source/usage.rst 2016-02-10 00:18:11.000000000 +0100 +++ new/oslosphinx-4.7.0/doc/source/usage.rst 2016-08-02 20:13:09.000000000 +0200 @@ -24,3 +24,14 @@ best to set the value in conf.py:: oslosphinx_cgit_link = 'http://git.openstack.org/cgit/openstack/oslosphinx' + +Showing Older Versions of Documentation +======================================= + +``oslosphinx`` can automatically add links for previous versions of your +project's documentation to the sidebar. If this feature is enabled links +will be generated for each git tag. To enable this behavior, set:: + + html_theme_options = {'show_other_versions': True} + +in your conf.py. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/oslosphinx/__init__.py new/oslosphinx-4.7.0/oslosphinx/__init__.py --- old/oslosphinx-4.3.0/oslosphinx/__init__.py 2016-02-10 00:18:11.000000000 +0100 +++ new/oslosphinx-4.7.0/oslosphinx/__init__.py 2016-08-02 20:13:09.000000000 +0200 @@ -16,6 +16,7 @@ import re import six from six.moves.urllib import parse +import string import subprocess @@ -42,9 +43,35 @@ def _html_page_context(app, pagename, templatename, context, doctree): # Insert the cgit link into the template context. context['cgit_link'] = app.config.oslosphinx_cgit_link + context['other_versions'] = _get_other_versions(app) return None +def _get_other_versions(app): + if not app.config.html_theme_options.get('show_other_versions', False): + return [] + + git_cmd = ["git", "tag"] + try: + raw_version_list = subprocess.Popen( + git_cmd, stdout=subprocess.PIPE).communicate()[0] + except OSError: + app.warn('Cannot get tags from git repository. ' + 'Not setting "other_versions".') + raw_version_list = '' + + # grab last five that start with a number and reverse the order + if six.PY3: + raw_version_list = raw_version_list.decode("utf8") + _tags = [t.strip("'") for t in raw_version_list.split('\n')] + other_versions = [ + t for t in _tags if t and t[0] in string.digits + # Don't show alpha, beta or release candidate tags + and 'rc' not in t and 'a' not in t and 'b' not in t + ][:-5:-1] + return other_versions + + def builder_inited(app): theme_dir = os.path.join(os.path.dirname(__file__), 'theme') app.info('Using openstack theme from %s' % theme_dir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/oslosphinx/theme/openstack/layout.html new/oslosphinx-4.7.0/oslosphinx/theme/openstack/layout.html --- old/oslosphinx-4.3.0/oslosphinx/theme/openstack/layout.html 2016-02-10 00:18:11.000000000 +0100 +++ new/oslosphinx-4.7.0/oslosphinx/theme/openstack/layout.html 2016-08-02 20:13:09.000000000 +0200 @@ -30,6 +30,17 @@ title="{{ _('next chapter') }}">{{ next.title }}</a></p> {%- endif %} {%- endblock %} + {%- block otherversions %} + {%- if other_versions %} + <h3>{{ _('Other Versions') }}</h3> + <ul class="this-page-menu"> + <li><a href="{{ pathto(master_doc) }}" rel="nofollow">Current</a></li> + {%- for ver in other_versions: %} + <li><a href="{{ pathto(ver, 1) }}" rel="nofollow">{{ ver }}</a></li> + {%- endfor %} + </ul> + {%- endif %} + {%- endblock %} {%- block projectsource %} {%- if cgit_link %} <h3>{{ _('Project Source') }}</h3> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/oslosphinx/theme/openstack/theme.conf new/oslosphinx-4.7.0/oslosphinx/theme/openstack/theme.conf --- old/oslosphinx-4.3.0/oslosphinx/theme/openstack/theme.conf 2016-02-10 00:18:11.000000000 +0100 +++ new/oslosphinx-4.7.0/oslosphinx/theme/openstack/theme.conf 2016-08-02 20:13:09.000000000 +0200 @@ -5,3 +5,4 @@ [options] incubating = false +show_other_versions = false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/oslosphinx.egg-info/PKG-INFO new/oslosphinx-4.7.0/oslosphinx.egg-info/PKG-INFO --- old/oslosphinx-4.3.0/oslosphinx.egg-info/PKG-INFO 2016-02-10 00:18:24.000000000 +0100 +++ new/oslosphinx-4.7.0/oslosphinx.egg-info/PKG-INFO 2016-08-02 20:14:38.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslosphinx -Version: 4.3.0 +Version: 4.7.0 Summary: OpenStack Sphinx Extensions and Theme Home-page: http://www.openstack.org/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/oslosphinx.egg-info/pbr.json new/oslosphinx-4.7.0/oslosphinx.egg-info/pbr.json --- old/oslosphinx-4.3.0/oslosphinx.egg-info/pbr.json 2016-02-10 00:18:24.000000000 +0100 +++ new/oslosphinx-4.7.0/oslosphinx.egg-info/pbr.json 2016-08-02 20:14:38.000000000 +0200 @@ -1 +1 @@ -{"is_release": true, "git_version": "8084f2a"} \ No newline at end of file +{"git_version": "3bcdfc6", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/oslosphinx.egg-info/requires.txt new/oslosphinx-4.7.0/oslosphinx.egg-info/requires.txt --- old/oslosphinx-4.3.0/oslosphinx.egg-info/requires.txt 2016-02-10 00:18:24.000000000 +0100 +++ new/oslosphinx-4.7.0/oslosphinx.egg-info/requires.txt 2016-08-02 20:14:38.000000000 +0200 @@ -1,3 +1,3 @@ pbr>=1.6 -requests!=2.9.0,>=2.8.1 +requests>=2.10.0 six>=1.9.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/requirements.txt new/oslosphinx-4.7.0/requirements.txt --- old/oslosphinx-4.3.0/requirements.txt 2016-02-10 00:18:11.000000000 +0100 +++ new/oslosphinx-4.7.0/requirements.txt 2016-08-02 20:13:09.000000000 +0200 @@ -3,5 +3,5 @@ # process, which may cause wedges in the gate later. pbr>=1.6 # Apache-2.0 -requests!=2.9.0,>=2.8.1 # Apache-2.0 +requests>=2.10.0 # Apache-2.0 six>=1.9.0 # MIT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/setup.cfg new/oslosphinx-4.7.0/setup.cfg --- old/oslosphinx-4.3.0/setup.cfg 2016-02-10 00:18:24.000000000 +0100 +++ new/oslosphinx-4.7.0/setup.cfg 2016-08-02 20:14:38.000000000 +0200 @@ -40,6 +40,6 @@ [egg_info] tag_build = -tag_svn_revision = 0 tag_date = 0 +tag_svn_revision = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-4.3.0/test-requirements.txt new/oslosphinx-4.7.0/test-requirements.txt --- old/oslosphinx-4.3.0/test-requirements.txt 2016-02-10 00:18:11.000000000 +0100 +++ new/oslosphinx-4.7.0/test-requirements.txt 2016-08-02 20:13:09.000000000 +0200 @@ -5,4 +5,4 @@ hacking<0.11,>=0.10.0 # this is required for the docs build jobs -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
