Hello community, here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2015-07-21 13:25:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pbr (Old) and /work/SRC/openSUSE:Factory/.python-pbr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pbr" Changes: -------- --- /work/SRC/openSUSE:Factory/python-pbr/python-pbr.changes 2015-06-17 16:15:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr.changes 2015-07-21 13:25:40.000000000 +0200 @@ -1,0 +2,21 @@ +Fri Jul 17 11:54:48 UTC 2015 - [email protected] + +- update to 1.3.0: + * Wrap env markers in parens + * Updated from global requirements + * Add more documentation around building docs + * Updated from global requirements + * Use string for 'OS_TEST_TIMEOUT' default + * Updated from global requirements + * This documents the use of comments that work between 2.6, 2.7 and 3.4 +- Add 0001-Remove-sphinx_config.init_values-manual-call.patch . Needed + for newer Sphinx versions. + +------------------------------------------------------------------- +Wed Jun 24 08:24:05 UTC 2015 - [email protected] + +- update to 1.2.0: + * Strip markers from test requirements + * Revert "Remove sphinx_config.init_values( + +------------------------------------------------------------------- Old: ---- pbr-1.1.0.tar.gz New: ---- 0001-Remove-sphinx_config.init_values-manual-call.patch pbr-1.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pbr.spec ++++++ --- /var/tmp/diff_new_pack.F1DfIZ/_old 2015-07-21 13:25:41.000000000 +0200 +++ /var/tmp/diff_new_pack.F1DfIZ/_new 2015-07-21 13:25:41.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with test Name: python-pbr -Version: 1.1.0 +Version: 1.3.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -29,6 +29,9 @@ Url: http://pypi.python.org/pypi/pbr Source: https://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz Source1: python-pbr-rpmlintrc +# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/ +# needed to be abe to use pbr with newer Sphinx versions +Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pip >= 1.4 @@ -76,6 +79,7 @@ %prep %setup -q -n pbr-%{version} +%patch0 -p1 # Get rid of ugly build-time deps that require network: sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py ++++++ 0001-Remove-sphinx_config.init_values-manual-call.patch ++++++ >From 12e36886fe343f8103a21c60d6925115ad8dbc26 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold <[email protected]> Date: Tue, 2 Jun 2015 18:40:38 +0200 Subject: [PATCH] Remove sphinx_config.init_values() manual call The function signature for Sphinx's config.init_values() changed since version 1.3. That leads to: TypeError: init_values() takes exactly 2 arguments (1 given) But the function is already correctly called from application.Sphinx()'s constructor. So use the configuration object from the application instead of creating an own config object. Commit 1dfe9ef348c777bef67b2c2b1d35e50ebc720333 already introduced this change and commit e41a9180ed3103bb45fa1d1be93ba951016b029c reverted it due to build failures with Sphinx 1.1.3 . The failure occurred because using the application class to detect if man pages can build raised a warning which was treated as error. This case is now handled and tested with Sphinx 1.1.3 and 1.3.1. Change-Id: Idf6c7b329880c6698b61ee9e88f29c0f6e0956bf Closes-Bug: #1379998 --- pbr/builddoc.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pbr/builddoc.py b/pbr/builddoc.py index 3c9a9a1..f7d7697 100644 --- a/pbr/builddoc.py +++ b/pbr/builddoc.py @@ -27,7 +27,6 @@ except ImportError: try: from sphinx import apidoc from sphinx import application - from sphinx import config from sphinx import setup_command except Exception as e: # NOTE(dhellmann): During the installation of docutils, setuptools @@ -129,10 +128,21 @@ class LocalBuildDoc(setup_command.BuildDoc): confoverrides['release'] = self.release if self.today: confoverrides['today'] = self.today - sphinx_config = config.Config(self.config_dir, 'conf.py', {}, []) - sphinx_config.init_values() - if self.builder == 'man' and len(sphinx_config.man_pages) == 0: + + # NOTE(toabctl): creating the app with "warningiserror=False" is + # used to detect if man_pages are available.Only needed for sphinx<1.3 + # See also https://github.com/sphinx-doc/sphinx/issues/1933 + app = application.Sphinx( + self.source_dir, self.config_dir, + self.builder_target_dir, self.doctree_dir, + self.builder, confoverrides, status_stream, + freshenv=self.fresh_env, warningiserror=False) + + if self.builder == 'man' and len(app.config.man_pages) == 0: return + + # NOTE(toabctl): Now create the app with "warningiserror=True for real + # usage app = application.Sphinx( self.source_dir, self.config_dir, self.builder_target_dir, self.doctree_dir, -- 2.4.5 ++++++ pbr-1.1.0.tar.gz -> pbr-1.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/AUTHORS new/pbr-1.3.0/AUTHORS --- old/pbr-1.1.0/AUTHORS 2015-06-09 05:14:57.000000000 +0200 +++ new/pbr-1.3.0/AUTHORS 2015-07-10 23:32:49.000000000 +0200 @@ -53,6 +53,7 @@ Mark Sienkiewicz <[email protected]> Maru Newby <[email protected]> Masaki Matsushita <[email protected]> +Matt Riedemann <[email protected]> Matthew Treinish <[email protected]> Michael Basnight <[email protected]> Michael Still <[email protected]> @@ -60,6 +61,7 @@ Monty Taylor <[email protected]> Nikhil Manchanda <[email protected]> Octavian Ciuhandu <[email protected]> +Paul Belanger <[email protected]> Rajaram Mallya <[email protected]> Ralf Haferkamp <[email protected]> Rick Harris <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/ChangeLog new/pbr-1.3.0/ChangeLog --- old/pbr-1.1.0/ChangeLog 2015-06-09 05:14:57.000000000 +0200 +++ new/pbr-1.3.0/ChangeLog 2015-07-10 23:32:49.000000000 +0200 @@ -1,6 +1,27 @@ CHANGES ======= +1.3.0 +----- + +* Wrap env markers in parens +* Updated from global requirements +* Add more documentation around building docs +* Updated from global requirements +* Use string for 'OS_TEST_TIMEOUT' default +* Updated from global requirements +* This documents the use of comments that work between 2.6, 2.7 and 3.4 + +1.2.0 +----- + +* Strip markers from test requirements + +1.1.1 +----- + +* Revert "Remove sphinx_config.init_values( + 1.1.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/PKG-INFO new/pbr-1.3.0/PKG-INFO --- old/pbr-1.1.0/PKG-INFO 2015-06-09 05:14:57.000000000 +0200 +++ new/pbr-1.3.0/PKG-INFO 2015-07-10 23:32:49.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pbr -Version: 1.1.0 +Version: 1.3.0 Summary: Python Build Reasonableness Home-page: https://launchpad.net/pbr Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/doc/source/index.rst new/pbr-1.3.0/doc/source/index.rst --- old/pbr-1.1.0/doc/source/index.rst 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/doc/source/index.rst 2015-07-10 23:32:31.000000000 +0200 @@ -95,6 +95,8 @@ also have several pieces of information that are known to setup.py injected into the sphinx config. +See the pbr_ section for details on configuring your project for autodoc. + Requirements ------------ @@ -296,8 +298,12 @@ --- The pbr section controls pbr specific options and behaviours. -The `autodoc_tree_index_modules` is a boolean value controlling whether pbr -should generate an index of modules using `sphinx-apidoc`. +The `autodoc_tree_index_modules` is a boolean option controlling whether pbr +should generate an index of modules using `sphinx-apidoc`. By default, setup.py +is excluded. The list of excluded modules can be specified with the +`autodoc_tree_excludes` option. See the +`sphinx-apidoc man page <http://sphinx-doc.org/man/sphinx-apidoc.html>`_ +for more information. The `autodoc_index_modules` is a boolean option controlling whether pbr should itself generates documentation for Python modules of the project. By default, @@ -305,6 +311,37 @@ them in `autodoc_exclude_modules`. This list of modules can contains `fnmatch` style pattern (e.g. `myapp.tests.*`) to exclude some modules. +The `warnerrors` boolean option is used to tell Sphinx builders to treat +warnings as errors which will cause sphinx-build to fail if it encounters +warnings. This is generally useful to ensure your documentation stays clean +once you have a good docs build. + +.. note:: + + When using `autodoc_tree_excludes` or `autodoc_index_modules` you may also + need to set `exclude_patterns` in your Sphinx configuration file (generally + found at doc/source/conf.py in most OpenStack projects) otherwise + Sphinx may complain about documents that are not in a toctree. This is + especially true if the `warnerrors=True` option is set. See + http://sphinx-doc.org/config.html for more information on configuring + Sphinx. + +Comments +-------- + +Comments may be used in setup.cfg, however all comments should start with a +`#` and may be on a single line, or in line, with at least one white space +character immediately preceding the `#`. Semicolons are not a supported +comment delimiter. For instance:: + + [section] + # A comment at the start of a dedicated line + key = + value1 # An in line comment + value2 + # A comment on a dedicated line + value3 + Additional Docs =============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr/builddoc.py new/pbr-1.3.0/pbr/builddoc.py --- old/pbr-1.1.0/pbr/builddoc.py 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/pbr/builddoc.py 2015-07-10 23:32:30.000000000 +0200 @@ -27,6 +27,7 @@ try: from sphinx import apidoc from sphinx import application + from sphinx import config from sphinx import setup_command except Exception as e: # NOTE(dhellmann): During the installation of docutils, setuptools @@ -128,16 +129,16 @@ confoverrides['release'] = self.release if self.today: confoverrides['today'] = self.today - + sphinx_config = config.Config(self.config_dir, 'conf.py', {}, []) + sphinx_config.init_values() + if self.builder == 'man' and len(sphinx_config.man_pages) == 0: + return app = application.Sphinx( self.source_dir, self.config_dir, self.builder_target_dir, self.doctree_dir, self.builder, confoverrides, status_stream, freshenv=self.fresh_env, warningiserror=True) - if self.builder == 'man' and len(app.config.man_pages) == 0: - return - try: app.build(force_all=self.all_files) except Exception as err: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr/hooks/backwards.py new/pbr-1.3.0/pbr/hooks/backwards.py --- old/pbr-1.1.0/pbr/hooks/backwards.py 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/pbr/hooks/backwards.py 2015-07-10 23:32:30.000000000 +0200 @@ -29,4 +29,5 @@ packaging.append_text_list( self.config, 'tests_require', packaging.parse_requirements( - packaging.TEST_REQUIREMENTS_FILES)) + packaging.TEST_REQUIREMENTS_FILES, + strip_markers=True)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr/packaging.py new/pbr-1.3.0/pbr/packaging.py --- old/pbr-1.1.0/pbr/packaging.py 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/pbr/packaging.py 2015-07-10 23:32:30.000000000 +0200 @@ -81,7 +81,7 @@ return [] -def parse_requirements(requirements_files=None): +def parse_requirements(requirements_files=None, strip_markers=False): if requirements_files is None: requirements_files = get_requirements_files() @@ -104,7 +104,8 @@ # -r other-requirements.txt if line.startswith('-r'): req_file = line.partition(' ')[2] - requirements += parse_requirements([req_file]) + requirements += parse_requirements( + [req_file], strip_markers=strip_markers) continue try: @@ -130,6 +131,11 @@ reason = 'Index Location' if line is not None: + if strip_markers: + semi_pos = line.find(';') + if semi_pos < 0: + semi_pos = None + line = line[:semi_pos] requirements.append(line) else: log.info( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr/tests/test_integration.py new/pbr-1.3.0/pbr/tests/test_integration.py --- old/pbr-1.1.0/pbr/tests/test_integration.py 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/pbr/tests/test_integration.py 2015-07-10 23:32:30.000000000 +0200 @@ -57,7 +57,8 @@ def setUp(self): # Integration tests need a higher default - big repos can be slow to # clone, particularly under guest load. - os.environ['OS_TEST_TIMEOUT'] = os.environ.get('OS_TEST_TIMEOUT', 600) + os.environ['OS_TEST_TIMEOUT'] = os.environ.get('OS_TEST_TIMEOUT', + '600') super(TestIntegration, self).setUp() base._config_git() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr/tests/test_packaging.py new/pbr-1.3.0/pbr/tests/test_packaging.py --- old/pbr-1.1.0/pbr/tests/test_packaging.py 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/pbr/tests/test_packaging.py 2015-07-10 23:32:31.000000000 +0200 @@ -454,8 +454,8 @@ # anonymous section instead of the empty string. Weird. expected_requirements = { None: ['bar'], - ":python_version=='2.6'": ['quux<1.0'], - "test:python_version=='2.7'": ['baz>3.2'], + ":(python_version=='2.6')": ['quux<1.0'], + "test:(python_version=='2.7')": ['baz>3.2'], "test": ['foo'] } setup_py = os.path.join(tempdir, 'setup.py') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr/tests/test_util.py new/pbr-1.3.0/pbr/tests/test_util.py --- old/pbr-1.1.0/pbr/tests/test_util.py 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/pbr/tests/test_util.py 2015-07-10 23:32:31.000000000 +0200 @@ -48,7 +48,7 @@ baz<1.6 :python_version=='2.6' """, 'expected_extra_requires': { - "test:python_version=='2.6'": ['foo', 'baz<1.6'], + "test:(python_version=='2.6')": ['foo', 'baz<1.6'], "test": ['bar']}}), ('no_extras', { 'config_text': """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr/tests/testpackage/test-requirements.txt new/pbr-1.3.0/pbr/tests/testpackage/test-requirements.txt --- old/pbr-1.1.0/pbr/tests/testpackage/test-requirements.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/pbr-1.3.0/pbr/tests/testpackage/test-requirements.txt 2015-07-10 23:32:30.000000000 +0200 @@ -0,0 +1 @@ +ordereddict;python_version=='2.6' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr/util.py new/pbr-1.3.0/pbr/util.py --- old/pbr-1.1.0/pbr/util.py 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/pbr/util.py 2015-07-10 23:32:31.000000000 +0200 @@ -418,7 +418,7 @@ for req_group in all_requirements: for requirement, env_marker in all_requirements[req_group]: if env_marker: - extras_key = '%s:%s' % (req_group, env_marker) + extras_key = '%s:(%s)' % (req_group, env_marker) else: extras_key = req_group extras_require.setdefault(extras_key, []).append(requirement) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr.egg-info/PKG-INFO new/pbr-1.3.0/pbr.egg-info/PKG-INFO --- old/pbr-1.1.0/pbr.egg-info/PKG-INFO 2015-06-09 05:14:57.000000000 +0200 +++ new/pbr-1.3.0/pbr.egg-info/PKG-INFO 2015-07-10 23:32:49.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pbr -Version: 1.1.0 +Version: 1.3.0 Summary: Python Build Reasonableness Home-page: https://launchpad.net/pbr Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr.egg-info/SOURCES.txt new/pbr-1.3.0/pbr.egg-info/SOURCES.txt --- old/pbr-1.1.0/pbr.egg-info/SOURCES.txt 2015-06-09 05:14:57.000000000 +0200 +++ new/pbr-1.3.0/pbr.egg-info/SOURCES.txt 2015-07-10 23:32:49.000000000 +0200 @@ -73,6 +73,7 @@ pbr/tests/testpackage/git-extra-file.txt pbr/tests/testpackage/setup.cfg pbr/tests/testpackage/setup.py +pbr/tests/testpackage/test-requirements.txt pbr/tests/testpackage/data_files/a.txt pbr/tests/testpackage/data_files/b.txt pbr/tests/testpackage/data_files/c.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/pbr.egg-info/pbr.json new/pbr-1.3.0/pbr.egg-info/pbr.json --- old/pbr-1.1.0/pbr.egg-info/pbr.json 2015-06-09 05:14:57.000000000 +0200 +++ new/pbr-1.3.0/pbr.egg-info/pbr.json 2015-07-10 23:32:49.000000000 +0200 @@ -1 +1 @@ -{"git_version": "dceb9e5", "is_release": true} \ No newline at end of file +{"git_version": "61a3a1e", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.1.0/test-requirements.txt new/pbr-1.3.0/test-requirements.txt --- old/pbr-1.1.0/test-requirements.txt 2015-06-09 05:14:39.000000000 +0200 +++ new/pbr-1.3.0/test-requirements.txt 2015-07-10 23:32:31.000000000 +0200 @@ -3,14 +3,15 @@ # process, which may cause wedges in the gate later. coverage>=3.6 discover -fixtures>=0.3.14 -hacking>=0.10.0,<0.11 -mock>=1.0 +fixtures>=1.3.1 +hacking<0.11,>=0.10.0 +mock>=1.0;python_version!='2.6' +mock==1.0.1;python_version=='2.6' python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 six>=1.9.0 testrepository>=0.0.18 testresources>=0.2.4 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 virtualenv
