Hello community, here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2015-08-29 20:03:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-doc.changes 2015-08-14 14:45:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr-doc.changes 2015-08-29 20:03:42.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Aug 26 06:20:59 UTC 2015 - tbechtold@suse.com + +- update to 1.6.0: + * Strip comments in requirements files + * Handle git being entirely absent + * We require the use of setuptools + * Fix retrieval of commit data and most recent tag + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python-pbr/python-pbr.changes 2015-08-14 14:45:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr.changes 2015-08-29 20:03:42.000000000 +0200 @@ -1,0 +2,11 @@ +Wed Aug 26 06:20:59 UTC 2015 - tbechtold@suse.com + +- update to 1.6.0: + * Strip comments in requirements files + * Handle git being entirely absent + * We require the use of setuptools + * Fix retrieval of commit data and most recent tag +- Remove 0001-Handle-git-being-entirely-absent.patch . + Applied upstream + +------------------------------------------------------------------- Old: ---- 0001-Handle-git-being-entirely-absent.patch pbr-1.4.0.tar.gz New: ---- pbr-1.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pbr-doc.spec ++++++ --- /var/tmp/diff_new_pack.TXO6gA/_old 2015-08-29 20:03:43.000000000 +0200 +++ /var/tmp/diff_new_pack.TXO6gA/_new 2015-08-29 20:03:43.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-pbr-doc -Version: 1.4.0 +Version: 1.6.0 Release: 0 Summary: Documentation for python-pbr License: Apache-2.0 ++++++ python-pbr.spec ++++++ --- /var/tmp/diff_new_pack.TXO6gA/_old 2015-08-29 20:03:43.000000000 +0200 +++ /var/tmp/diff_new_pack.TXO6gA/_new 2015-08-29 20:03:43.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with test Name: python-pbr -Version: 1.4.0 +Version: 1.6.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -32,7 +32,6 @@ # 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 -Patch1: 0001-Handle-git-being-entirely-absent.patch BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pip >= 1.4 @@ -71,7 +70,6 @@ %prep %setup -q -n pbr-%{version} %patch0 -p1 -%patch1 -p1 # Get rid of ugly build-time deps that require network: sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py ++++++ pbr-1.4.0.tar.gz -> pbr-1.6.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.4.0/AUTHORS new/pbr-1.6.0/AUTHORS --- old/pbr-1.4.0/AUTHORS 2015-08-03 21:59:53.000000000 +0200 +++ new/pbr-1.6.0/AUTHORS 2015-08-24 23:31:23.000000000 +0200 @@ -31,6 +31,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 +45,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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.4.0/ChangeLog new/pbr-1.6.0/ChangeLog --- old/pbr-1.4.0/ChangeLog 2015-08-03 21:59:53.000000000 +0200 +++ new/pbr-1.6.0/ChangeLog 2015-08-24 23:31:23.000000000 +0200 @@ -1,6 +1,18 @@ CHANGES ======= +1.6.0 +----- + +* Strip comments in requirements files + +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 ----- @@ -18,6 +30,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.4.0/PKG-INFO new/pbr-1.6.0/PKG-INFO --- old/pbr-1.4.0/PKG-INFO 2015-08-03 21:59:53.000000000 +0200 +++ new/pbr-1.6.0/PKG-INFO 2015-08-24 23:31:23.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pbr -Version: 1.4.0 +Version: 1.6.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.4.0/doc/source/index.rst new/pbr-1.6.0/doc/source/index.rst --- old/pbr-1.4.0/doc/source/index.rst 2015-08-03 21:59:33.000000000 +0200 +++ new/pbr-1.6.0/doc/source/index.rst 2015-08-24 23:30:59.000000000 +0200 @@ -174,7 +174,7 @@ Usage ===== -pbr requires a distribution to use distribute. Your distribution +pbr requires a distribution to use setuptools. Your distribution must include a distutils2-like setup.cfg file, and a minimal setup.py script. A simple sample can be found in pbr's own setup.cfg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.4.0/pbr/git.py new/pbr-1.6.0/pbr/git.py --- old/pbr-1.4.0/pbr/git.py 2015-08-03 21:59:33.000000000 +0200 +++ new/pbr-1.6.0/pbr/git.py 2015-08-24 23:30:59.000000000 +0200 @@ -18,6 +18,7 @@ import distutils.errors from distutils import log +import errno import io import os import re @@ -64,7 +65,13 @@ def _get_git_directory(): - return _run_shell_command(['git', 'rev-parse', '--git-dir']) + try: + return _run_shell_command(['git', 'rev-parse', '--git-dir']) + except OSError as e: + if e.errno == errno.ENOENT: + # git not installed. + return '' + raise def _git_is_installed(): @@ -162,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 @@ -172,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) @@ -220,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.4.0/pbr/hooks/commands.py new/pbr-1.6.0/pbr/hooks/commands.py --- old/pbr-1.4.0/pbr/hooks/commands.py 2015-08-03 21:59:33.000000000 +0200 +++ new/pbr-1.6.0/pbr/hooks/commands.py 2015-08-24 23:30:59.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.4.0/pbr/packaging.py new/pbr-1.6.0/pbr/packaging.py --- old/pbr-1.4.0/pbr/packaging.py 2015-08-03 21:59:33.000000000 +0200 +++ new/pbr-1.6.0/pbr/packaging.py 2015-08-24 23:30:59.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 @@ -414,7 +435,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.4.0/pbr/tests/test_commands.py new/pbr-1.6.0/pbr/tests/test_commands.py --- old/pbr-1.4.0/pbr/tests/test_commands.py 2015-08-03 21:59:33.000000000 +0200 +++ new/pbr-1.6.0/pbr/tests/test_commands.py 2015-08-24 23:30:59.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.4.0/pbr/tests/test_packaging.py new/pbr-1.6.0/pbr/tests/test_packaging.py --- old/pbr-1.4.0/pbr/tests/test_packaging.py 2015-08-03 21:59:33.000000000 +0200 +++ new/pbr-1.6.0/pbr/tests/test_packaging.py 2015-08-24 23:30:59.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: @@ -469,11 +484,14 @@ # 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'] } + 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.4.0/pbr.egg-info/PKG-INFO new/pbr-1.6.0/pbr.egg-info/PKG-INFO --- old/pbr-1.4.0/pbr.egg-info/PKG-INFO 2015-08-03 21:59:53.000000000 +0200 +++ new/pbr-1.6.0/pbr.egg-info/PKG-INFO 2015-08-24 23:31:23.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pbr -Version: 1.4.0 +Version: 1.6.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.4.0/pbr.egg-info/pbr.json new/pbr-1.6.0/pbr.egg-info/pbr.json --- old/pbr-1.4.0/pbr.egg-info/pbr.json 2015-08-03 21:59:53.000000000 +0200 +++ new/pbr-1.6.0/pbr.egg-info/pbr.json 2015-08-24 23:31:23.000000000 +0200 @@ -1 +1 @@ -{"git_version": "1e4d883", "is_release": true} \ No newline at end of file +{"git_version": "1e05037", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.4.0/setup.cfg new/pbr-1.6.0/setup.cfg --- old/pbr-1.4.0/setup.cfg 2015-08-03 21:59:53.000000000 +0200 +++ new/pbr-1.6.0/setup.cfg 2015-08-24 23:31:23.000000000 +0200 @@ -53,7 +53,7 @@ universal = 1 [egg_info] -tag_date = 0 tag_svn_revision = 0 tag_build = +tag_date = 0