Hello community, here is the log from the commit of package python-oslosphinx for openSUSE:Factory checked in at 2015-07-12 22:52:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-28 19:54:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-oslosphinx.new/python-oslosphinx.changes 2015-07-12 22:52:32.000000000 +0200 @@ -1,0 +2,29 @@ +Tue Mar 10 15:18:05 UTC 2015 - tbecht...@suse.com + +- update to 2.5.0: + * Speed up blueprint checking with naming convention + +------------------------------------------------------------------- +Tue Feb 24 15:44:36 UTC 2015 - tbecht...@suse.com + +- update to 2.4.0: + * Allow alternate OpenStack themes + * Add links to the README + * Add run_cross_tests.sh from incubator + * Add an extension for validating blueprint names + * Workflow documentation is now in infra-manual +- Add python-requests as Requires + +------------------------------------------------------------------- +Wed Jan 14 09:29:32 UTC 2015 - dmuel...@suse.com + +- update to version 2.3.0: + * provide visual separation in sidebar + * Updated from global requirements + * Add pbr to installation requirements + * Report documentation build warnings as errors + * Add initial cut for documentation + * Remove empty file + * warn against sorting requirements + +------------------------------------------------------------------- Old: ---- oslosphinx-2.2.0.tar.gz New: ---- oslosphinx-2.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-oslosphinx.spec ++++++ --- /var/tmp/diff_new_pack.zm6h1J/_old 2015-07-12 22:52:33.000000000 +0200 +++ /var/tmp/diff_new_pack.zm6h1J/_new 2015-07-12 22:52:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-oslosphinx # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-oslosphinx -Version: 2.2.0 +Version: 2.5.0 Release: 0 Url: https://launchpad.net/oslo/ Summary: OpenStack Sphinx @@ -28,7 +28,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: python-devel BuildRequires: python-pbr -Requires: python-pbr +Requires: python-pbr >= 0.6 +Requires: python-requests >= 2.2.0 Provides: python-oslo.sphinx = %{version} Obsoletes: python-oslo.sphinx < %{version} Provides: %{name}-doc = %{version} ++++++ oslosphinx-2.2.0.tar.gz -> oslosphinx-2.5.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/AUTHORS new/oslosphinx-2.5.0/AUTHORS --- old/oslosphinx-2.2.0/AUTHORS 2014-09-18 12:49:37.000000000 +0200 +++ new/oslosphinx-2.5.0/AUTHORS 2015-03-03 17:09:15.000000000 +0100 @@ -4,12 +4,15 @@ Davanum Srinivas <d...@linux.vnet.ibm.com> Dirk Mueller <d...@dmllr.de> Doug Hellmann <doug.hellm...@dreamhost.com> +Doug Hellmann <d...@doughellmann.com> Graham Hayes <graham.ha...@hp.com> +Jeremy Stanley <fu...@yuggoth.org> Joe Gordon <joe.gord...@gmail.com> Julien Danjou <jul...@danjou.info> Mark McLoughlin <mar...@redhat.com> Monty Taylor <mord...@inaugust.com> Sascha Peilicke <sasc...@gmx.de> Sascha Peilicke <speili...@suse.com> +Sean Dague <s...@dague.net> Sergey Lukjanov <slukja...@mirantis.com> Vishvananda Ishaya <vishvana...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/CONTRIBUTING.rst new/oslosphinx-2.5.0/CONTRIBUTING.rst --- old/oslosphinx-2.2.0/CONTRIBUTING.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/CONTRIBUTING.rst 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,16 @@ +If you would like to contribute to the development of OpenStack, +you must follow the steps in this page: + + http://docs.openstack.org/infra/manual/developers.html + +Once those steps have been completed, changes to OpenStack +should be submitted for review via the Gerrit tool, following +the workflow documented at: + + http://docs.openstack.org/infra/manual/developers.html#development-workflow + +Pull requests submitted through GitHub will be ignored. + +Bugs should be filed on Launchpad, not GitHub: + + https://bugs.launchpad.net/oslosphinx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/ChangeLog new/oslosphinx-2.5.0/ChangeLog --- old/oslosphinx-2.2.0/ChangeLog 2014-09-18 12:49:37.000000000 +0200 +++ new/oslosphinx-2.5.0/ChangeLog 2015-03-03 17:09:15.000000000 +0100 @@ -1,6 +1,33 @@ CHANGES ======= +2.5.0 +----- + +* Speed up blueprint checking with naming convention + +2.4.0 +----- + +* Allow alternate OpenStack themes +* Update run_cross_tests.sh to latest +* Add links to the README +* Add run_cross_tests.sh from incubator +* Add an extension for validating blueprint names +* Workflow documentation is now in infra-manual + +2.3.0 +----- + +* provide visual separation in sidebar +* Updated from global requirements +* Add pbr to installation requirements +* Tighten up documentation +* Report documentation build warnings as errors +* Add initial cut for documentation +* Remove empty file +* warn against sorting requirements + 2.2.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/PKG-INFO new/oslosphinx-2.5.0/PKG-INFO --- old/oslosphinx-2.2.0/PKG-INFO 2014-09-18 12:49:37.000000000 +0200 +++ new/oslosphinx-2.5.0/PKG-INFO 2015-03-03 17:09:16.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslosphinx -Version: 2.2.0 +Version: 2.5.0 Summary: OpenStack Sphinx Extensions and Theme Home-page: http://www.openstack.org/ Author: OpenStack @@ -12,12 +12,10 @@ Theme and extension support for Sphinx documentation from the OpenStack project. - To use the theme, add ``'oslosphinx'`` to the ``extensions`` list in - the ``conf.py`` file in your Sphinx project. - - If you are an incubating project, set: - - ``html_theme_options = {'incubating': True}`` in your conf.py as well, to enable the Incubation theme. + * Free software: Apache License, Version 2.0 + * Documentation: http://docs.openstack.org/developer/oslosphinx + * Source: http://git.openstack.org/cgit/openstack/oslosphinx + * Bugs: http://bugs.launchpad.net/oslosphinx Platform: UNKNOWN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/README.rst new/oslosphinx-2.5.0/README.rst --- old/oslosphinx-2.2.0/README.rst 2014-09-18 12:49:33.000000000 +0200 +++ new/oslosphinx-2.5.0/README.rst 2015-03-03 17:09:02.000000000 +0100 @@ -4,9 +4,7 @@ Theme and extension support for Sphinx documentation from the OpenStack project. -To use the theme, add ``'oslosphinx'`` to the ``extensions`` list in -the ``conf.py`` file in your Sphinx project. - -If you are an incubating project, set: - -``html_theme_options = {'incubating': True}`` in your conf.py as well, to enable the Incubation theme. +* Free software: Apache License, Version 2.0 +* Documentation: http://docs.openstack.org/developer/oslosphinx +* Source: http://git.openstack.org/cgit/openstack/oslosphinx +* Bugs: http://bugs.launchpad.net/oslosphinx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/doc/source/check_blueprints.rst new/oslosphinx-2.5.0/doc/source/check_blueprints.rst --- old/oslosphinx-2.2.0/doc/source/check_blueprints.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/doc/source/check_blueprints.rst 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,48 @@ +=========================================================== + Using oslosphinx.check_blueprints with Specs Repositories +=========================================================== + +The ``oslosphinx.check_blueprints`` extension verifies that the +filenames in spec repositories match a blueprint under a given +launchpad project. + +Enabling +======== + +Add ``'oslosphinx.check_blueprints'`` to the ``extensions`` list in +the ``conf.py`` file in your Sphinx project. + +Specifying the Launchpad Project +================================ + +Most projects should set ``check_blueprints_project`` to the name of +their launchpad project. This limits the search to the single project +named. + +:: + + check_blueprints_project = 'nova' + +Projects with multiple launchpad projects under their own project +group (such as Oslo), should instead set +``check_blueprints_project_group``. All projects in the group will be +scanned for each spec/blueprint name. + +:: + + check_blueprints_project_group = 'oslo' + +Checking Only the Current Release +================================= + +By default, all files under ``specs/`` are checked. For large specs +repositories, this can take a long time. To limit the checks to a +subdirectory for the current release, set +``check_blueprints_release``. + +For example:: + + check_blueprints_release = 'kilo' + +will cause files under ``specs/kilo`` to be checked, and other files +to be ignored. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/doc/source/conf.py new/oslosphinx-2.5.0/doc/source/conf.py --- old/oslosphinx-2.2.0/doc/source/conf.py 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/doc/source/conf.py 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +# 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. + +import os +import sys + +sys.path.insert(0, os.path.abspath('../..')) +# -- General configuration ---------------------------------------------------- + +# Add any Sphinx extension module names here, as strings. They can be +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +extensions = [ + 'sphinx.ext.autodoc', + #'sphinx.ext.intersphinx', + 'oslosphinx' +] + +# autodoc generation is a bit aggressive and a nuisance when doing heavy +# text edit cycles. +# execute "export SPHINX_DEBUG=1" in your terminal to disable + +# The suffix of source filenames. +source_suffix = '.rst' + +# The master toctree document. +master_doc = 'index' + +# General information about the project. +project = u'oslosphinx' +copyright = u'2013, OpenStack Foundation' + +# If true, '()' will be appended to :func: etc. cross-reference text. +add_function_parentheses = True + +# If true, the current module name will be prepended to all description +# unit titles (such as .. function::). +add_module_names = True + +# The name of the Pygments (syntax highlighting) style to use. +pygments_style = 'sphinx' + +# -- Options for HTML output -------------------------------------------------- + +# The theme to use for HTML and HTML Help pages. Major themes that come with +# Sphinx are currently 'default' and 'sphinxdoc'. +# html_theme_path = ["."] +# html_theme = '_theme' +# html_static_path = ['static'] + +# Output file base name for HTML help builder. +htmlhelp_basename = '%sdoc' % project + +# Grouping the document tree into LaTeX files. List of tuples +# (source start file, target name, title, author, documentclass +# [howto/manual]). +latex_documents = [ + ('index', + '%s.tex' % project, + u'%s Documentation' % project, + u'OpenStack Foundation', 'manual'), +] + +# Example configuration for intersphinx: refer to the Python standard library. +#intersphinx_mapping = {'http://docs.python.org/': None} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/doc/source/contributing.rst new/oslosphinx-2.5.0/doc/source/contributing.rst --- old/oslosphinx-2.2.0/doc/source/contributing.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/doc/source/contributing.rst 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,5 @@ +============== + Contributing +============== + +.. include:: ../../CONTRIBUTING.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/doc/source/index.rst new/oslosphinx-2.5.0/doc/source/index.rst --- old/oslosphinx-2.2.0/doc/source/index.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/doc/source/index.rst 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,17 @@ +============ + oslosphinx +============ + +.. toctree:: + :maxdepth: 2 + + usage + check_blueprints + contributing + +Indices and tables +================== + +* :ref:`genindex` +* :ref:`modindex` +* :ref:`search` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/doc/source/usage.rst new/oslosphinx-2.5.0/doc/source/usage.rst --- old/oslosphinx-2.2.0/doc/source/usage.rst 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/doc/source/usage.rst 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,15 @@ +============================ + Using the oslosphinx Theme +============================ + +To use the theme, add ``'oslosphinx'`` to the ``extensions`` list in +the ``conf.py`` file in your Sphinx project. + +Incubating Projects +=================== + +If you are an incubating project, set:: + + html_theme_options = {'incubating': True} + +in your conf.py as well, to enable the Incubation theme. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/openstack-common.conf new/oslosphinx-2.5.0/openstack-common.conf --- old/oslosphinx-2.2.0/openstack-common.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/openstack-common.conf 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,7 @@ +[DEFAULT] + +# The list of modules to copy from oslo-incubator.git +script = tools/run_cross_tests.sh + +# The base module to hold the copy of openstack.common +base=oslosphinx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/oslosphinx/__init__.py new/oslosphinx-2.5.0/oslosphinx/__init__.py --- old/oslosphinx-2.2.0/oslosphinx/__init__.py 2014-09-18 12:49:33.000000000 +0200 +++ new/oslosphinx-2.5.0/oslosphinx/__init__.py 2015-03-03 17:09:02.000000000 +0100 @@ -19,14 +19,16 @@ theme_dir = os.path.join(os.path.dirname(__file__), 'theme') app.info('Using openstack theme from %s' % theme_dir) # Insert our theme directory at the front of the search path and - # force the theme setting to use the one in the package. This is - # done here, instead of in setup(), because conf.py is read after - # setup() runs, so if the conf contains these values the user - # values overwrite these. That's not bad for the theme, but it - # breaks the search path. + # force the theme setting to use the one in the package unless + # another openstack theme is already selected. This is done here, + # instead of in setup(), because conf.py is read after setup() + # runs, so if the conf contains these values the user values + # overwrite these. That's not bad for the theme, but it breaks the + # search path. app.config.html_theme_path.insert(0, theme_dir) # Set the theme name - app.config.html_theme = 'openstack' + if not app.config.html_theme.startswith('openstack'): + app.config.html_theme = 'openstack' # Re-initialize the builder, if it has the method for setting up # the templates and theme. if hasattr(app.builder, 'init_templates'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/oslosphinx/check_blueprints.py new/oslosphinx-2.5.0/oslosphinx/check_blueprints.py --- old/oslosphinx-2.2.0/oslosphinx/check_blueprints.py 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/oslosphinx/check_blueprints.py 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,130 @@ +# All Rights Reserved. +# +# 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. +"""Ensure that the name of the spec file matches the name of a blueprint. +""" + +import requests + + +class BlueprintChecker(object): + + def __init__(self, app): + self.app = app + self.project_names = [] + self._good_bps = set() + self._prefix = None + self._warn_search = 'unset' + + BP_URL_TEMPLATE = 'https://api.launchpad.net/devel/%s/+spec/%s' + PROJ_LIST_URL_TEMPLATE = 'https://api.launchpad.net/1.0/%s/projects' + + def _load_project_settings(self): + if self.project_names: + return + # If a project_name is set in the configuration, use + # that. Otherwise, allow any project in the project group. + project_name = self.app.config.check_blueprints_project + pg_name = self.app.config.check_blueprints_project_group + if project_name: + self.project_names = [project_name] + self._warn_search = 'the %s project' % project_name + else: + proj_list_response = requests.get(self.PROJ_LIST_URL_TEMPLATE + % pg_name) + projects = proj_list_response.json()['entries'] + self.project_names = [p['name'] for p in projects] + self._warn_search = ('any projects in the %s project group' + % pg_name) + + @property + def desired_prefix(self): + """Determine the prefix for files we care to check. + + We only care about blueprints in the current release, if the + check_blueprints_release option is set. + + """ + if self._prefix is None: + release = self.app.config.check_blueprints_release + if release: + self._prefix = 'specs/%s/' % release + else: + self._prefix = 'specs/' + return self._prefix + + def doctree_resolved(self, app, doctree, docname): + """Hook registered as event handler.""" + if not docname.startswith(self.desired_prefix): + return + bp_name = docname.split('/')[-1] + if bp_name == 'index': + return + self.check(bp_name) + + def blueprint_exists(self, project_name, bp_name): + """Return boolean indicating whether the blueprint exists.""" + self.app.info('Checking for %s in %s' % (bp_name, project_name)) + url = self.BP_URL_TEMPLATE % (project_name, bp_name) + response = requests.get(url) + if response.status_code == 200: + self.app.info('Found %s in %s' % (bp_name, project_name)) + return True + return False + + def check(self, bp_name): + """Given one blueprint name, check to see if it is valid.""" + if bp_name in self._good_bps: + return True + self._load_project_settings() + self.app.info('') # emit newline + candidate_project, dash, bp_name_to_find = bp_name.partition('-') + if candidate_project in self.project_names: + # First check the shortened name of the blueprint in the project. + if self.blueprint_exists(candidate_project, bp_name_to_find): + return + # Then check the full name of the blueprint in the project. + if self.blueprint_exists(candidate_project, bp_name): + return + self.app.info( + ('Blueprint name %r looks like it starts with a project ' + 'name, but %r was not found in project %r') % + (bp_name, bp_name_to_find, candidate_project) + ) + else: + self.app.info( + 'Blueprint checking is faster if the file names ' + 'start with the launchpad project name.' + ) + for project_name in self.project_names: + if self.blueprint_exists(project_name, bp_name): + self._good_bps.add(bp_name) + break + else: + self.app.warn( + 'Could not find a blueprint called %r in %s' + % (bp_name, self._warn_search), + location=(bp_name, 0), + ) + raise ValueError( + 'Document %s does not match any blueprint name in %s' + % (bp_name, self._warn_search)) + + +def setup(app): + app.info('Initializing %s' % __name__) + checker = BlueprintChecker(app) + app.connect('doctree-resolved', checker.doctree_resolved) + app.add_config_value('check_blueprints_project_group', 'openstack', 'env') + app.add_config_value('check_blueprints_project', '', 'env') + app.add_config_value('check_blueprints_release', '', 'env') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/oslosphinx/theme/openstack/static/tweaks.css new/oslosphinx-2.5.0/oslosphinx/theme/openstack/static/tweaks.css --- old/oslosphinx-2.2.0/oslosphinx/theme/openstack/static/tweaks.css 2014-09-18 12:49:33.000000000 +0200 +++ new/oslosphinx-2.5.0/oslosphinx/theme/openstack/static/tweaks.css 2015-03-03 17:09:02.000000000 +0100 @@ -101,4 +101,15 @@ div.sphinxsidebar h3.highlighted a { color: #EEE; -} \ No newline at end of file +} + +/** provide visual separation for sidebar for increased readability. */ +div.sphinxsidebar ul li { + margin-top: 1em; + font-weight: bold; +} + +div.sphinxsidebar ul li ul li { + margin-top: 0; + font-weight: normal; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/oslosphinx.egg-info/PKG-INFO new/oslosphinx-2.5.0/oslosphinx.egg-info/PKG-INFO --- old/oslosphinx-2.2.0/oslosphinx.egg-info/PKG-INFO 2014-09-18 12:49:37.000000000 +0200 +++ new/oslosphinx-2.5.0/oslosphinx.egg-info/PKG-INFO 2015-03-03 17:09:15.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: oslosphinx -Version: 2.2.0 +Version: 2.5.0 Summary: OpenStack Sphinx Extensions and Theme Home-page: http://www.openstack.org/ Author: OpenStack @@ -12,12 +12,10 @@ Theme and extension support for Sphinx documentation from the OpenStack project. - To use the theme, add ``'oslosphinx'`` to the ``extensions`` list in - the ``conf.py`` file in your Sphinx project. - - If you are an incubating project, set: - - ``html_theme_options = {'incubating': True}`` in your conf.py as well, to enable the Incubation theme. + * Free software: Apache License, Version 2.0 + * Documentation: http://docs.openstack.org/developer/oslosphinx + * Source: http://git.openstack.org/cgit/openstack/oslosphinx + * Bugs: http://bugs.launchpad.net/oslosphinx Platform: UNKNOWN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/oslosphinx.egg-info/SOURCES.txt new/oslosphinx-2.5.0/oslosphinx.egg-info/SOURCES.txt --- old/oslosphinx-2.2.0/oslosphinx.egg-info/SOURCES.txt 2014-09-18 12:49:37.000000000 +0200 +++ new/oslosphinx-2.5.0/oslosphinx.egg-info/SOURCES.txt 2015-03-03 17:09:16.000000000 +0100 @@ -1,20 +1,30 @@ AUTHORS +CONTRIBUTING.rst ChangeLog HACKING.rst LICENSE MANIFEST.in README.rst +openstack-common.conf requirements.txt setup.cfg setup.py test-requirements.txt tox.ini +doc/source/check_blueprints.rst +doc/source/conf.py +doc/source/contributing.rst +doc/source/index.rst +doc/source/usage.rst oslosphinx/__init__.py +oslosphinx/check_blueprints.py oslosphinx/intersphinx.py oslosphinx.egg-info/PKG-INFO oslosphinx.egg-info/SOURCES.txt oslosphinx.egg-info/dependency_links.txt oslosphinx.egg-info/not-zip-safe +oslosphinx.egg-info/pbr.json +oslosphinx.egg-info/requires.txt oslosphinx.egg-info/top_level.txt oslosphinx/theme/openstack/layout.html oslosphinx/theme/openstack/theme.conf @@ -24,4 +34,5 @@ oslosphinx/theme/openstack/static/header_bg.jpg oslosphinx/theme/openstack/static/nature.css oslosphinx/theme/openstack/static/openstack_logo.png -oslosphinx/theme/openstack/static/tweaks.css \ No newline at end of file +oslosphinx/theme/openstack/static/tweaks.css +tools/run_cross_tests.sh \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/oslosphinx.egg-info/pbr.json new/oslosphinx-2.5.0/oslosphinx.egg-info/pbr.json --- old/oslosphinx-2.2.0/oslosphinx.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/oslosphinx.egg-info/pbr.json 2015-03-03 17:09:15.000000000 +0100 @@ -0,0 +1 @@ +{"is_release": true, "git_version": "e1b0dca"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/oslosphinx.egg-info/requires.txt new/oslosphinx-2.5.0/oslosphinx.egg-info/requires.txt --- old/oslosphinx-2.2.0/oslosphinx.egg-info/requires.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/oslosphinx.egg-info/requires.txt 2015-03-03 17:09:15.000000000 +0100 @@ -0,0 +1,2 @@ +pbr>=0.6,!=0.7,<1.0 +requests>=2.2.0,!=2.4.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/requirements.txt new/oslosphinx-2.5.0/requirements.txt --- old/oslosphinx-2.2.0/requirements.txt 2014-09-18 12:49:33.000000000 +0200 +++ new/oslosphinx-2.5.0/requirements.txt 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,6 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +pbr>=0.6,!=0.7,<1.0 +requests>=2.2.0,!=2.4.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/setup.cfg new/oslosphinx-2.5.0/setup.cfg --- old/oslosphinx-2.2.0/setup.cfg 2014-09-18 12:49:37.000000000 +0200 +++ new/oslosphinx-2.5.0/setup.cfg 2015-03-03 17:09:16.000000000 +0100 @@ -36,8 +36,11 @@ [wheel] universal = 1 +[pbr] +warnerrors = True + [egg_info] -tag_svn_revision = 0 tag_build = +tag_svn_revision = 0 tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/test-requirements.txt new/oslosphinx-2.5.0/test-requirements.txt --- old/oslosphinx-2.2.0/test-requirements.txt 2014-09-18 12:49:33.000000000 +0200 +++ new/oslosphinx-2.5.0/test-requirements.txt 2015-03-03 17:09:02.000000000 +0100 @@ -1 +1,8 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + hacking>=0.9.2,<0.10 + +# this is required for the docs build jobs +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/tools/run_cross_tests.sh new/oslosphinx-2.5.0/tools/run_cross_tests.sh --- old/oslosphinx-2.2.0/tools/run_cross_tests.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/oslosphinx-2.5.0/tools/run_cross_tests.sh 2015-03-03 17:09:02.000000000 +0100 @@ -0,0 +1,100 @@ +#!/bin/bash +# +# Run cross-project tests +# +# Usage: +# +# run_cross_tests.sh project_dir venv + +# Fail the build if any command fails +set -e + +project_dir="$1" +shift +venv="$1" +shift +posargs="$*" + +if [ -z "$project_dir" -o -z "$venv" ] +then + cat - <<EOF +ERROR: Missing argument(s) + +Usage: + + $0 PROJECT_DIR VIRTUAL_ENV [POSARGS] + +Example, run the python 2.7 tests for python-neutronclient: + + $0 /opt/stack/python-neutronclient py27 + $0 /opt/stack/nova py27 xenapi + +EOF + exit 1 +fi + +# Set up the virtualenv without running the tests +(cd $project_dir && tox --notest -e $venv) + +tox_envbin=$project_dir/.tox/$venv/bin + +our_name=$(python setup.py --name) + +# Build the egg-info, including the source file list, +# so we install all of the files, even if the package +# list or name has changed. +python setup.py egg_info + +# Replace the pip-installed package with the version in our source +# tree. Look to see if we are already installed before trying to +# uninstall ourselves, to avoid failures from packages that do not use us +# yet. +if $tox_envbin/pip freeze | grep -q $our_name +then + $tox_envbin/pip uninstall -y $our_name || echo "Ignoring error" +fi +$tox_envbin/pip install -U . + +# Run the tests +(cd $project_dir && tox -e $venv -- $posargs) +result=$? + + +# The below checks are modified from +# openstack-infra/config/modules/jenkins/files/slave_scripts/run-unittests.sh. + +# They expect to be run in the project being tested. +cd $project_dir + +echo "Begin pip freeze output from test virtualenv:" +echo "======================================================================" +.tox/$venv/bin/pip freeze +echo "======================================================================" + +# We only want to run the next check if the tool is installed, so look +# for it before continuing. +if [ -f /usr/local/jenkins/slave_scripts/subunit2html.py -a -d ".testrepository" ] ; then + if [ -f ".testrepository/0.2" ] ; then + cp .testrepository/0.2 ./subunit_log.txt + elif [ -f ".testrepository/0" ] ; then + .tox/$venv/bin/subunit-1to2 < .testrepository/0 > ./subunit_log.txt + fi + .tox/$venv/bin/python /usr/local/jenkins/slave_scripts/subunit2html.py ./subunit_log.txt testr_results.html + gzip -9 ./subunit_log.txt + gzip -9 ./testr_results.html + + export PYTHON=.tox/$venv/bin/python + set -e + rancount=$(.tox/$venv/bin/testr last | sed -ne 's/Ran \([0-9]\+\).*tests in.*/\1/p') + if [ "$rancount" -eq "0" ] ; then + echo + echo "Zero tests were run. At least one test should have been run." + echo "Failing this test as a result" + echo + exit 1 + fi +fi + +# If we make it this far, report status based on the tests that were +# run. +exit $result diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/oslosphinx-2.2.0/tox.ini new/oslosphinx-2.5.0/tox.ini --- old/oslosphinx-2.2.0/tox.ini 2014-09-18 12:49:33.000000000 +0200 +++ new/oslosphinx-2.5.0/tox.ini 2015-03-03 17:09:02.000000000 +0100 @@ -1,13 +1,11 @@ [tox] minversion = 1.6 -skipsdist = True envlist = pep8 [testenv] usedevelop = True install_command = pip install -U {opts} {packages} -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements.txt setenv = VIRTUAL_ENV={envdir} sitepackages = False downloadcache = {toxworkdir}/_download @@ -19,6 +17,9 @@ [testenv:venv] commands = {posargs} +[testenv:docs] +commands = python setup.py build_sphinx + [flake8] exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools show-source = True
