Hello community, here is the log from the commit of package python3-pbr for openSUSE:Factory checked in at 2015-09-30 05:51:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-pbr (Old) and /work/SRC/openSUSE:Factory/.python3-pbr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-pbr" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-pbr/python3-pbr-doc.changes 2015-08-15 11:39:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-pbr.new/python3-pbr-doc.changes 2015-09-30 05:52:01.000000000 +0200 @@ -1,0 +2,18 @@ +Sat Sep 19 14:52:44 UTC 2015 - arun@gmx.de + +- specfile: + * removed patch (fixed upstream): + 0001-Remove-sphinx_config.init_values-manual-call.patch + +- update to version 1.8.0: + * Strip comments present in setup.cfg + * Protect WSGI application with a critical section + +- changes from version 1.7.0: + * Have pbr egg_info.writer check PBR is enabled + +- changes from version 1.6.0: + * Strip comments in requirements files + * Support Sphinx >=1.3 new protoype and warnings + +------------------------------------------------------------------- python3-pbr.changes: same change Old: ---- 0001-Remove-sphinx_config.init_values-manual-call.patch pbr-1.5.0.tar.gz New: ---- pbr-1.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-pbr-doc.spec ++++++ --- /var/tmp/diff_new_pack.rhLD2V/_old 2015-09-30 05:52:02.000000000 +0200 +++ /var/tmp/diff_new_pack.rhLD2V/_new 2015-09-30 05:52:02.000000000 +0200 @@ -17,7 +17,7 @@ Name: python3-pbr-doc -Version: 1.5.0 +Version: 1.8.0 Release: 0 Summary: Documentation for python3-pbr License: Apache-2.0 @@ -25,9 +25,6 @@ Url: http://pypi.python.org/pypi/pbr Source: http://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz Source1: python3-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: python3-devel BuildRequires: python3-setuptools @@ -44,7 +41,6 @@ %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 ++++++ python3-pbr.spec ++++++ --- /var/tmp/diff_new_pack.rhLD2V/_old 2015-09-30 05:52:02.000000000 +0200 +++ /var/tmp/diff_new_pack.rhLD2V/_new 2015-09-30 05:52:02.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with test Name: python3-pbr -Version: 1.5.0 +Version: 1.8.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -29,9 +29,6 @@ Url: http://pypi.python.org/pypi/pbr Source: http://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz Source1: python3-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: python3-devel BuildRequires: python3-setuptools @@ -67,7 +64,6 @@ %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 ++++++ pbr-1.5.0.tar.gz -> pbr-1.8.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/AUTHORS new/pbr-1.8.0/AUTHORS --- old/pbr-1.5.0/AUTHORS 2015-08-13 21:33:57.000000000 +0200 +++ new/pbr-1.8.0/AUTHORS 2015-09-14 22:59:19.000000000 +0200 @@ -1,5 +1,6 @@ Akihiro Motoki <motoki@da.jp.nec.com> Alex Gaynor <alex.gaynor@gmail.com> +Alexander Makarov <amakarov@mirantis.com> Andreas Jaeger <aj@suse.de> Andrew Bogott <abogott@wikimedia.org> Angus Salkeld <asalkeld@redhat.com> @@ -31,6 +32,7 @@ Eric Windisch <eric@cloudscaling.com> Erik M. Bray <embray@stsci.edu> Eugene Kirpichov <ekirpichov@gmail.com> +Florian Wilhelm <Florian.Wilhelm@blue-yonder.com> Gary Kotton <gkotton@redhat.com> Giampaolo Lauria <lauria@us.ibm.com> Ionuț Arțăriși <iartarisi@suse.cz> @@ -44,6 +46,7 @@ Joe Heck <heckj@mac.com> Johannes Erdfelt <johannes.erdfelt@rackspace.com> Joshua Harlow <harlowja@gmail.com> +Joshua Harlow <harlowja@yahoo-inc.com> Julien Danjou <julien@danjou.info> Kevin McCarthy <me@kevinmccarthy.org> Khai Do <zaro0508@gmail.com> @@ -85,6 +88,7 @@ Thomas Grainger <tagrain@gmail.com> Thomas Leaman <thomas.leaman@hp.com> Tim Simpson <tim.simpson@rackspace.com> +Timothy Chavez <timothy.chavez@hp.com> Toilal <toilal.dev@gmail.com> Vasudev Kamath <kamathvasudev@gmail.com> Vincent Untz <vuntz@suse.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/ChangeLog new/pbr-1.8.0/ChangeLog --- old/pbr-1.5.0/ChangeLog 2015-08-13 21:33:57.000000000 +0200 +++ new/pbr-1.8.0/ChangeLog 2015-09-14 22:59:19.000000000 +0200 @@ -1,11 +1,29 @@ CHANGES ======= +1.8.0 +----- + +* Strip comments present in setup.cfg +* Protect WSGI application with a critical section + +1.7.0 +----- + +* Have pbr egg_info.writer check PBR is enabled + +1.6.0 +----- + +* Strip comments in requirements files +* Support Sphinx >=1.3 new protoype and warnings + 1.5.0 ----- * Handle git being entirely absent * We require the use of setuptools +* Fix retrieval of commit data and most recent tag 1.4.0 ----- @@ -24,6 +42,7 @@ * Wrap env markers in parens * Updated from global requirements * Add more documentation around building docs +* Expose a 'rpm_version' extra command * Updated from global requirements * Use string for 'OS_TEST_TIMEOUT' default * Updated from global requirements diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/PKG-INFO new/pbr-1.8.0/PKG-INFO --- old/pbr-1.5.0/PKG-INFO 2015-08-13 21:33:57.000000000 +0200 +++ new/pbr-1.8.0/PKG-INFO 2015-09-14 22:59:19.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pbr -Version: 1.5.0 +Version: 1.8.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.5.0/pbr/builddoc.py new/pbr-1.8.0/pbr/builddoc.py --- old/pbr-1.5.0/pbr/builddoc.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/builddoc.py 2015-09-14 22:58:58.000000000 +0200 @@ -17,7 +17,9 @@ from distutils import log import fnmatch import os +import pkg_resources import sys +import warnings try: import cStringIO @@ -130,14 +132,19 @@ if self.today: confoverrides['today'] = self.today sphinx_config = config.Config(self.config_dir, 'conf.py', {}, []) - sphinx_config.init_values() + sphinx_ver = pkg_resources.get_distribution("sphinx").version + if pkg_resources.parse_version(sphinx_ver) >= \ + pkg_resources.parse_version('1.3.1'): + sphinx_config.init_values(warnings.warn) + else: + 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) + freshenv=self.fresh_env, warningiserror=False) try: app.build(force_all=self.all_files) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr/git.py new/pbr-1.8.0/pbr/git.py --- old/pbr-1.5.0/pbr/git.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/git.py 2015-09-14 22:58:58.000000000 +0200 @@ -169,7 +169,7 @@ first_line = False -def _iter_log_oneline(git_dir=None, option_dict=None): +def _iter_log_oneline(git_dir=None): """Iterate over --oneline log entries if possible. This parses the output into a structured form but does not apply @@ -179,16 +179,10 @@ :return: An iterator of (hash, tags_set, 1st_line) tuples, or None if changelog generation is disabled / not available. """ - if not option_dict: - option_dict = {} - should_skip = options.get_boolean_option(option_dict, 'skip_changelog', - 'SKIP_WRITE_GIT_CHANGELOG') - if should_skip: - return if git_dir is None: git_dir = _get_git_directory() if not git_dir: - return + return [] return _iter_log_inner(git_dir) @@ -227,11 +221,17 @@ def write_git_changelog(git_dir=None, dest_dir=os.path.curdir, - option_dict=dict(), changelog=None): + option_dict=None, changelog=None): """Write a changelog based on the git changelog.""" start = time.time() + if not option_dict: + option_dict = {} + should_skip = options.get_boolean_option(option_dict, 'skip_changelog', + 'SKIP_WRITE_GIT_CHANGELOG') + if should_skip: + return if not changelog: - changelog = _iter_log_oneline(git_dir=git_dir, option_dict=option_dict) + changelog = _iter_log_oneline(git_dir=git_dir) if changelog: changelog = _iter_changelog(changelog) if not changelog: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr/hooks/commands.py new/pbr-1.8.0/pbr/hooks/commands.py --- old/pbr-1.5.0/pbr/hooks/commands.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/hooks/commands.py 2015-09-14 22:58:58.000000000 +0200 @@ -42,6 +42,7 @@ self.add_command('pbr.packaging.LocalSDist') self.add_command('pbr.packaging.LocalInstallScripts') self.add_command('pbr.packaging.LocalDevelop') + self.add_command('pbr.packaging.LocalRPMVersion') if os.name != 'nt': easy_install.get_script_args = packaging.override_get_script_args diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr/packaging.py new/pbr-1.8.0/pbr/packaging.py --- old/pbr-1.5.0/pbr/packaging.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/packaging.py 2015-09-14 22:58:58.000000000 +0200 @@ -28,6 +28,7 @@ import sys import pkg_resources +import setuptools from setuptools.command import develop from setuptools.command import easy_install from setuptools.command import egg_info @@ -131,6 +132,7 @@ reason = 'Index Location' if line is not None: + line = re.sub('#.*$', '', line) if strip_markers: semi_pos = line.find(';') if semi_pos < 0: @@ -202,6 +204,25 @@ testr_command.Testr.run(self) +class LocalRPMVersion(setuptools.Command): + __doc__ = """Output the rpm *compatible* version string of this package""" + description = __doc__ + + user_options = [] + command_name = "rpm_version" + + def run(self): + log.info("[pbr] Extracting rpm version") + name = self.distribution.get_name() + print(version.VersionInfo(name).semantic_version().rpm_string()) + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def have_testr(): return testr_command.have_testr @@ -229,6 +250,8 @@ _wsgi_text = """#PBR Generated from %(group)r +import threading + from %(module_name)s import %(import_target)s if __name__ == "__main__": @@ -254,7 +277,12 @@ server.serve_forever() else: - application = %(invoke_target)s() + application = None + app_lock = threading.Lock() + + with app_lock: + if application is None: + application = %(invoke_target)s() """ @@ -414,7 +442,7 @@ def _from_git(distribution): option_dict = distribution.get_option_dict('pbr') - changelog = git._iter_log_oneline(option_dict=option_dict) + changelog = git._iter_log_oneline() if changelog: changelog = git._iter_changelog(changelog) git.write_git_changelog(option_dict=option_dict, changelog=changelog) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr/pbr_json.py new/pbr-1.8.0/pbr/pbr_json.py --- old/pbr-1.5.0/pbr/pbr_json.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/pbr_json.py 2015-09-14 22:58:58.000000000 +0200 @@ -20,6 +20,8 @@ def write_pbr_json(cmd, basename, filename): + if not cmd.distribution.pbr: + return git_dir = git._run_git_functions() if not git_dir: return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr/tests/test_commands.py new/pbr-1.8.0/pbr/tests/test_commands.py --- old/pbr-1.5.0/pbr/tests/test_commands.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/tests/test_commands.py 2015-09-14 22:58:58.000000000 +0200 @@ -56,3 +56,11 @@ self.addDetail('stderr', content.text_content(stderr)) self.assertIn('Running custom build_py command.', stdout) self.assertEqual(return_code, 0) + + def test_custom_rpm_version_py_command(self): + """Test custom rpm_version command.""" + stdout, stderr, return_code = self.run_setup('rpm_version') + self.addDetail('stdout', content.text_content(stdout)) + self.addDetail('stderr', content.text_content(stderr)) + self.assertIn('Extracting rpm version', stdout) + self.assertEqual(return_code, 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr/tests/test_packaging.py new/pbr-1.8.0/pbr/tests/test_packaging.py --- old/pbr-1.5.0/pbr/tests/test_packaging.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/tests/test_packaging.py 2015-09-14 22:58:58.000000000 +0200 @@ -444,6 +444,18 @@ version = packaging._get_version_from_git() self.assertEqual('1.3.0.0a1', version) + def test_skip_write_git_changelog(self): + # Fix for bug 1467440 + self.repo.commit() + self.repo.tag('1.2.3') + os.environ['SKIP_WRITE_GIT_CHANGELOG'] = '1' + version = packaging._get_version_from_git('1.2.3') + self.assertEqual('1.2.3', version) + + def tearDown(self): + super(TestVersions, self).tearDown() + os.environ.pop('SKIP_WRITE_GIT_CHANGELOG', None) + class TestRequirementParsing(base.BaseTestCase): @@ -454,6 +466,9 @@ f.write(textwrap.dedent(six.u("""\ bar quux<1.0; python_version=='2.6' + requests-aws>=0.1.4 # BSD License (3 clause) + Routes>=1.12.3,!=2.0,!=2.1;python_version=='2.7' + requests-kerberos>=0.6;python_version=='2.7' # MIT """))) setup_cfg = os.path.join(tempdir, 'setup.cfg') with open(setup_cfg, 'wt') as f: @@ -464,16 +479,20 @@ [extras] test = foo - baz>3.2 :python_version=='2.7' + baz>3.2 :python_version=='2.7' # MIT + bar>3.3 :python_version=='2.7' # MIT # Apache """))) # pkg_resources.split_sections uses None as the title of an # anonymous section instead of the empty string. Weird. expected_requirements = { - None: ['bar'], + None: ['bar', 'requests-aws>=0.1.4'], ":(python_version=='2.6')": ['quux<1.0'], - "test:(python_version=='2.7')": ['baz>3.2'], - "test": ['foo'] + ":(python_version=='2.7')": ['Routes>=1.12.3,!=2.0,!=2.1', + 'requests-kerberos>=0.6'], + 'test': ['foo'], + "test:(python_version=='2.7')": ['baz>3.2', 'bar>3.3'] } + setup_py = os.path.join(tempdir, 'setup.py') with open(setup_py, 'wt') as f: f.write(textwrap.dedent(six.u("""\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr/tests/test_wsgi.py new/pbr-1.8.0/pbr/tests/test_wsgi.py --- old/pbr-1.5.0/pbr/tests/test_wsgi.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/tests/test_wsgi.py 2015-09-14 22:58:58.000000000 +0200 @@ -164,7 +164,7 @@ "%s" % app_name) else_block = """else: - application = %s()""" % app_name + application = None""" self.assertIn(main_block, script_txt) self.assertIn(starting_block, script_txt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr/util.py new/pbr-1.8.0/pbr/util.py --- old/pbr-1.5.0/pbr/util.py 2015-08-13 21:33:38.000000000 +0200 +++ new/pbr-1.8.0/pbr/util.py 2015-09-14 22:58:58.000000000 +0200 @@ -334,7 +334,7 @@ # Split install_requires into package,env_marker tuples # These will be re-assembled later install_requires = [] - requirement_pattern = '(?P<package>[^;]*);?(?P<env_marker>.*)$' + requirement_pattern = '(?P<package>[^;]*);?(?P<env_marker>[^#]*?)(?:\s*#.*)?$' for requirement in in_cfg_value: m = re.match(requirement_pattern, requirement) requirement_package = m.group('package').strip() @@ -394,7 +394,7 @@ # -> {'fred': ['bar'], 'fred:marker':['foo']} if 'extras' in config: - requirement_pattern = '(?P<package>[^:]*):?(?P<env_marker>.*)$' + requirement_pattern = '(?P<package>[^:]*):?(?P<env_marker>[^#]*?)(?:\s*#.*)?$' extras = config['extras'] for extra in extras: extra_requirements = [] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr.egg-info/PKG-INFO new/pbr-1.8.0/pbr.egg-info/PKG-INFO --- old/pbr-1.5.0/pbr.egg-info/PKG-INFO 2015-08-13 21:33:57.000000000 +0200 +++ new/pbr-1.8.0/pbr.egg-info/PKG-INFO 2015-09-14 22:59:19.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pbr -Version: 1.5.0 +Version: 1.8.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.5.0/pbr.egg-info/SOURCES.txt new/pbr-1.8.0/pbr.egg-info/SOURCES.txt --- old/pbr-1.5.0/pbr.egg-info/SOURCES.txt 2015-08-13 21:33:57.000000000 +0200 +++ new/pbr-1.8.0/pbr.egg-info/SOURCES.txt 2015-09-14 22:59:19.000000000 +0200 @@ -43,7 +43,6 @@ pbr.egg-info/dependency_links.txt pbr.egg-info/entry_points.txt pbr.egg-info/not-zip-safe -pbr.egg-info/pbr.json pbr.egg-info/top_level.txt pbr/cmd/__init__.py pbr/cmd/main.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/pbr.egg-info/pbr.json new/pbr-1.8.0/pbr.egg-info/pbr.json --- old/pbr-1.5.0/pbr.egg-info/pbr.json 2015-08-13 21:33:57.000000000 +0200 +++ new/pbr-1.8.0/pbr.egg-info/pbr.json 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -{"is_release": true, "git_version": "5c0bb91"} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.5.0/setup.cfg new/pbr-1.8.0/setup.cfg --- old/pbr-1.5.0/setup.cfg 2015-08-13 21:33:57.000000000 +0200 +++ new/pbr-1.8.0/setup.cfg 2015-09-14 22:59:19.000000000 +0200 @@ -54,6 +54,6 @@ [egg_info] tag_build = -tag_svn_revision = 0 tag_date = 0 +tag_svn_revision = 0