Hello community, here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2015-06-17 16:15:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09 08:48:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr.changes 2015-06-17 16:15:10.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jun 9 07:17:47 UTC 2015 - [email protected] + +- update to 1.1.0: + * Fix test case to be runnable with gnupg 2.1 + * More explicit data_files install location docs + * Move CapturedSubprocess fixture to base + * Remove sphinx_config.init_values() manual call + * Updated from global requirements + * builddoc: allow to use fnmatch-style exclusion for autodoc + * doc: add some basic doc about pbr doc options + * Add home-page into sample setup.cfg + * Make setup.py --help-commands work without testrepository +- Removed 0001-Remove-sphinx_config.init_values-manual-call.patch + Applied upstream. + +------------------------------------------------------------------- Old: ---- 0001-Remove-sphinx_config.init_values-manual-call.patch pbr-1.0.1.tar.gz New: ---- pbr-1.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pbr.spec ++++++ --- /var/tmp/diff_new_pack.uCvPoX/_old 2015-06-17 16:15:11.000000000 +0200 +++ /var/tmp/diff_new_pack.uCvPoX/_new 2015-06-17 16:15:11.000000000 +0200 @@ -21,7 +21,7 @@ %bcond_with test Name: python-pbr -Version: 1.0.1 +Version: 1.1.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -29,8 +29,6 @@ Url: http://pypi.python.org/pypi/pbr Source: https://pypi.python.org/packages/source/p/pbr/pbr-%{version}.tar.gz Source1: python-pbr-rpmlintrc -# PATCH-FIX-UPSTREAM needed to be able to use Sphinx >= 1.3 versions -Patch: 0001-Remove-sphinx_config.init_values-manual-call.patch BuildRequires: fdupes BuildRequires: python-devel BuildRequires: python-pip >= 1.4 @@ -78,7 +76,6 @@ %prep %setup -q -n pbr-%{version} -%patch -p1 # Get rid of ugly build-time deps that require network: sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py ++++++ pbr-1.0.1.tar.gz -> pbr-1.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/AUTHORS new/pbr-1.1.0/AUTHORS --- old/pbr-1.0.1/AUTHORS 2015-05-20 00:37:15.000000000 +0200 +++ new/pbr-1.1.0/AUTHORS 2015-06-09 05:14:57.000000000 +0200 @@ -1,3 +1,4 @@ +Akihiro Motoki <[email protected]> Alex Gaynor <[email protected]> Andreas Jaeger <[email protected]> Andrew Bogott <[email protected]> @@ -68,6 +69,7 @@ Ruby Loo <[email protected]> Russell Bryant <[email protected]> Ryan Petrello <[email protected]> +Sachi King <[email protected]> Sascha Peilicke <[email protected]> Sean Dague <[email protected]> Sean Dague <[email protected]> @@ -75,6 +77,7 @@ Steve Kowalik <[email protected]> Steve Martinelli <[email protected]> Steven Hardy <[email protected]> +Thomas Bechtold <[email protected]> Thomas Goirand <[email protected]> Thomas Grainger <[email protected]> Thomas Leaman <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/ChangeLog new/pbr-1.1.0/ChangeLog --- old/pbr-1.0.1/ChangeLog 2015-05-20 00:37:15.000000000 +0200 +++ new/pbr-1.1.0/ChangeLog 2015-06-09 05:14:57.000000000 +0200 @@ -1,10 +1,24 @@ CHANGES ======= +1.1.0 +----- + +* Fix test case to be runnable with gnupg 2.1 +* More explicit data_files install location docs +* Move CapturedSubprocess fixture to base +* Remove sphinx_config.init_values() manual call +* Updated from global requirements +* builddoc: allow to use fnmatch-style exclusion for autodoc +* doc: add some basic doc about pbr doc options +* Add home-page into sample setup.cfg +* Make setup.py --help-commands work without testrepository + 1.0.1 ----- * Remove self.pre_run calls in packaging.py +* Add kerberos deps to build the kerberos wheel * Update hacking to 0.10.x series 1.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/PKG-INFO new/pbr-1.1.0/PKG-INFO --- old/pbr-1.0.1/PKG-INFO 2015-05-20 00:37:15.000000000 +0200 +++ new/pbr-1.1.0/PKG-INFO 2015-06-09 05:14:57.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pbr -Version: 1.0.1 +Version: 1.1.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.0.1/doc/source/index.rst new/pbr-1.1.0/doc/source/index.rst --- old/pbr-1.0.1/doc/source/index.rst 2015-05-20 00:36:58.000000000 +0200 +++ new/pbr-1.1.0/doc/source/index.rst 2015-06-09 05:14:39.000000000 +0200 @@ -184,6 +184,7 @@ author-email = [email protected] summary = OpenStack's setup automation in a reusable form description-file = README + home-page = https://launchpad.net/pbr license = Apache-2 classifier = Development Status :: 4 - Beta @@ -263,10 +264,13 @@ Will result in `/etc/neutron` containing `api-paste.ini` and `dhcp-agent.ini`, both of which pbr will expect to find in the `etc` directory in the root of the source tree. Additionally, `neutron.init` from that dir will be installed -in `/etc/init.d`. +in `/etc/init.d`. All of the files and directories located under `etc/pbr` in +the source tree will be installed into `/etc/pbr`. -All of the files and directories located under `etc/pbr` in the source tree -will be installed into `/etc/pbr`. +Note that this behavior is relative to the effective root of the environment +into which the packages are installed, so depending on available permissions +this could be the actual system-wide `/etc` directory or just a top-level `etc` +subdirectory of a virtualenv. entry_points ------------ @@ -288,6 +292,19 @@ `Plain` class in `pbr.cfg.driver` and one called `fancy` which maps to the `Fancy` class in `pbr.cfg.driver`. +pbr +--- +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_index_modules` is a boolean option controlling whether pbr should +itself generates documentation for Python modules of the project. By default, +all found Python modules are included; some of them can be excluded by listing +them in `autodoc_exclude_modules`. This list of modules can contains `fnmatch` +style pattern (e.g. `myapp.tests.*`) to exclude some modules. + Additional Docs =============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/pbr/builddoc.py new/pbr-1.1.0/pbr/builddoc.py --- old/pbr-1.0.1/pbr/builddoc.py 2015-05-20 00:36:58.000000000 +0200 +++ new/pbr-1.1.0/pbr/builddoc.py 2015-06-09 05:14:39.000000000 +0200 @@ -15,6 +15,7 @@ # under the License. from distutils import log +import fnmatch import os import sys @@ -26,7 +27,6 @@ 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 @@ -85,10 +85,12 @@ if '.' not in pkg: for dirpath, dirnames, files in os.walk(pkg): _find_modules(modules, dirpath, files) - module_list = set(modules.keys()) - if excluded_modules is not None: - module_list -= set(excluded_modules) - module_list = sorted(module_list) + + def include(module): + return not any(fnmatch.fnmatch(module, pat) + for pat in excluded_modules) + + module_list = sorted(mod for mod in modules.keys() if include(mod)) autoindex_filename = os.path.join(source_dir, 'autoindex.rst') with open(autoindex_filename, 'w') as autoindex: autoindex.write(""".. toctree:: @@ -126,16 +128,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: @@ -171,9 +173,9 @@ self._sphinx_tree() if auto_index: self.generate_autoindex( - option_dict.get( + set(option_dict.get( "autodoc_exclude_modules", - [None, ""])[1].split()) + [None, ""])[1].split())) for builder in self.builders: self.builder = builder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/pbr/packaging.py new/pbr-1.1.0/pbr/packaging.py --- old/pbr-1.0.1/pbr/packaging.py 2015-05-20 00:36:59.000000000 +0200 +++ new/pbr-1.1.0/pbr/packaging.py 2015-06-09 05:14:39.000000000 +0200 @@ -39,6 +39,7 @@ from pbr import git from pbr import options import pbr.pbr_json +from pbr import testr_command from pbr import version REQUIREMENTS_FILES = ('requirements.txt', 'tools/pip-requires') @@ -170,26 +171,19 @@ return du_install.install.run(self) -try: - from pbr import testr_command - - class TestrTest(testr_command.Testr): - """Make setup.py test do the right thing.""" - - command_name = 'test' +class TestrTest(testr_command.Testr): + """Make setup.py test do the right thing.""" - def run(self): - # Can't use super - base class old-style class - testr_command.Testr.run(self) + command_name = 'test' - _have_testr = True - -except ImportError: - _have_testr = False + def run(self): + # Can't use super - base class old-style class + testr_command.Testr.run(self) def have_testr(): - return _have_testr + return testr_command.have_testr + try: from nose import commands diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/pbr/testr_command.py new/pbr-1.1.0/pbr/testr_command.py --- old/pbr-1.0.1/pbr/testr_command.py 2015-05-20 00:36:58.000000000 +0200 +++ new/pbr-1.1.0/pbr/testr_command.py 2015-06-09 05:14:39.000000000 +0200 @@ -44,12 +44,10 @@ import os import sys -from testrepository import commands - logger = logging.getLogger(__name__) -class Testr(cmd.Command): +class TestrReal(cmd.Command): description = "Run unit tests using testr" @@ -133,3 +131,26 @@ logger.debug("_coverage_after called") os.system("coverage combine") os.system("coverage html -d ./cover %s" % self.omit) + + +class TestrFake(cmd.Command): + description = "Run unit tests using testr" + user_options = [] + + def initialize_options(self): + pass + + def finalize_options(self): + pass + + def run(self): + print("Install testrepository to run 'testr' command properly.") + + +try: + from testrepository import commands + have_testr = True + Testr = TestrReal +except ImportError: + have_testr = False + Testr = TestrFake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/pbr/tests/base.py new/pbr-1.1.0/pbr/tests/base.py --- old/pbr-1.0.1/pbr/tests/base.py 2015-05-20 00:36:58.000000000 +0200 +++ new/pbr-1.1.0/pbr/tests/base.py 2015-06-09 05:14:39.000000000 +0200 @@ -47,6 +47,7 @@ import fixtures import testresources import testtools +from testtools import content from pbr import options @@ -147,6 +148,48 @@ return result +class CapturedSubprocess(fixtures.Fixture): + """Run a process and capture its output. + + :attr stdout: The output (a string). + :attr stderr: The standard error (a string). + :attr returncode: The return code of the process. + + Note that stdout and stderr are decoded from the bytestrings subprocess + returns using error=replace. + """ + + def __init__(self, label, *args, **kwargs): + """Create a CapturedSubprocess. + + :param label: A label for the subprocess in the test log. E.g. 'foo'. + :param *args: The *args to pass to Popen. + :param **kwargs: The **kwargs to pass to Popen. + """ + super(CapturedSubprocess, self).__init__() + self.label = label + self.args = args + self.kwargs = kwargs + self.kwargs['stderr'] = subprocess.PIPE + self.kwargs['stdin'] = subprocess.PIPE + self.kwargs['stdout'] = subprocess.PIPE + + def setUp(self): + super(CapturedSubprocess, self).setUp() + proc = subprocess.Popen(*self.args, **self.kwargs) + out, err = proc.communicate() + self.out = out.decode('utf-8', 'replace') + self.err = err.decode('utf-8', 'replace') + self.addDetail(self.label + '-stdout', content.text_content(self.out)) + self.addDetail(self.label + '-stderr', content.text_content(self.err)) + self.returncode = proc.returncode + if proc.returncode: + raise AssertionError('Failed process %s' % proc.returncode) + self.addCleanup(delattr, self, 'out') + self.addCleanup(delattr, self, 'err') + self.addCleanup(delattr, self, 'returncode') + + def _run_cmd(args, cwd): """Run the command args in cwd. @@ -158,8 +201,8 @@ args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd) streams = tuple(s.decode('latin1').strip() for s in p.communicate()) - for content in streams: - print(content) + for stream_content in streams: + print(stream_content) return (streams) + (p.returncode,) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/pbr/tests/test_integration.py new/pbr-1.1.0/pbr/tests/test_integration.py --- old/pbr-1.0.1/pbr/tests/test_integration.py 2015-05-20 00:36:58.000000000 +0200 +++ new/pbr-1.1.0/pbr/tests/test_integration.py 2015-06-09 05:14:39.000000000 +0200 @@ -13,12 +13,10 @@ import os.path import shlex -import subprocess import fixtures import testscenarios import testtools -from testtools import content import virtualenv from pbr.tests import base @@ -52,48 +50,6 @@ yield (short_name, dict(name=name, short_name=short_name)) -class CapturedSubprocess(fixtures.Fixture): - """Run a process and capture its output. - - :attr stdout: The output (a string). - :attr stderr: The standard error (a string). - :attr returncode: The return code of the process. - - Note that stdout and stderr are decoded from the bytestrings subprocess - returns using error=replace. - """ - - def __init__(self, label, *args, **kwargs): - """Create a CapturedSubprocess. - - :param label: A label for the subprocess in the test log. E.g. 'foo'. - :param *args: The *args to pass to Popen. - :param **kwargs: The **kwargs to pass to Popen. - """ - super(CapturedSubprocess, self).__init__() - self.label = label - self.args = args - self.kwargs = kwargs - self.kwargs['stderr'] = subprocess.PIPE - self.kwargs['stdin'] = subprocess.PIPE - self.kwargs['stdout'] = subprocess.PIPE - - def setUp(self): - super(CapturedSubprocess, self).setUp() - proc = subprocess.Popen(*self.args, **self.kwargs) - out, err = proc.communicate() - self.out = out.decode('utf-8', 'replace') - self.err = err.decode('utf-8', 'replace') - self.addDetail(self.label + '-stdout', content.text_content(self.out)) - self.addDetail(self.label + '-stderr', content.text_content(self.err)) - self.returncode = proc.returncode - if proc.returncode: - raise AssertionError('Failed process %s' % proc.returncode) - self.addCleanup(delattr, self, 'out') - self.addCleanup(delattr, self, 'err') - self.addCleanup(delattr, self, 'returncode') - - class TestIntegration(base.BaseTestCase): scenarios = list(all_projects()) @@ -109,7 +65,7 @@ path = self.useFixture(fixtures.TempDir()).path virtualenv.create_environment(path, clear=True) python = os.path.join(path, 'bin', 'python') - self.useFixture(CapturedSubprocess( + self.useFixture(base.CapturedSubprocess( 'mkvenv-' + reason, [python] + PIP_CMD + [ '-U', PIPVERSION, 'wheel', PBRVERSION])) return path, python @@ -126,29 +82,29 @@ # We don't break these into separate tests because we'd need separate # source dirs to isolate from side effects of running pip, and the # overheads of setup would start to beat the benefits of parallelism. - self.useFixture(CapturedSubprocess( + self.useFixture(base.CapturedSubprocess( 'sync-req', ['python', 'update.py', os.path.join(REPODIR, self.short_name)], cwd=os.path.join(REPODIR, 'requirements'))) - self.useFixture(CapturedSubprocess( + self.useFixture(base.CapturedSubprocess( 'commit-requirements', 'git diff --quiet || git commit -amrequirements', cwd=os.path.join(REPODIR, self.short_name), shell=True)) path = os.path.join( self.useFixture(fixtures.TempDir()).path, 'project') - self.useFixture(CapturedSubprocess( + self.useFixture(base.CapturedSubprocess( 'clone', ['git', 'clone', os.path.join(REPODIR, self.short_name), path])) _, python = self.venv('sdist') - self.useFixture(CapturedSubprocess( + self.useFixture(base.CapturedSubprocess( 'sdist', [python, 'setup.py', 'sdist'], cwd=path)) _, python = self.venv('tarball') filename = os.path.join( path, 'dist', os.listdir(os.path.join(path, 'dist'))[0]) - self.useFixture(CapturedSubprocess( + self.useFixture(base.CapturedSubprocess( 'tarball', [python] + PIP_CMD + [filename])) root, python = self.venv('install-git') - self.useFixture(CapturedSubprocess( + self.useFixture(base.CapturedSubprocess( 'install-git', [python] + PIP_CMD + ['git+file://' + path])) if self.short_name == 'nova': found = False @@ -157,7 +113,7 @@ found = True self.assertTrue(found) _, python = self.venv('install-e') - self.useFixture(CapturedSubprocess( + self.useFixture(base.CapturedSubprocess( 'install-e', [python] + PIP_CMD + ['-e', path])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/pbr/tests/test_packaging.py new/pbr-1.1.0/pbr/tests/test_packaging.py --- old/pbr-1.0.1/pbr/tests/test_packaging.py 2015-05-20 00:36:58.000000000 +0200 +++ new/pbr-1.1.0/pbr/tests/test_packaging.py 2015-06-09 05:14:39.000000000 +0200 @@ -99,12 +99,27 @@ def setUp(self): super(GPGKeyFixture, self).setUp() tempdir = self.useFixture(fixtures.TempDir()) + gnupg_version_re = re.compile('^gpg\s.*\s([\d+])\.([\d+])\.([\d+])') + gnupg_version = base._run_cmd(['gpg', '--version'], tempdir.path) + for line in gnupg_version[0].split('\n'): + gnupg_version = gnupg_version_re.match(line) + if gnupg_version: + gnupg_version = (int(gnupg_version.group(1)), + int(gnupg_version.group(2)), + int(gnupg_version.group(3))) + break + else: + if gnupg_version is None: + gnupg_version = (0, 0, 0) config_file = tempdir.path + '/key-config' f = open(config_file, 'wt') try: + if gnupg_version[0] == 2 and gnupg_version[1] >= 1: + f.write(""" + %no-protection + %transient-key + """) f.write(""" - #%no-protection -- these would be ideal but they are documented - #%transient-key -- but not implemented in gnupg! %no-ask-passphrase Key-Type: RSA Name-Real: Example Key @@ -119,16 +134,9 @@ # Note that --quick-random (--debug-quick-random in GnuPG 2.x) # does not have a corresponding preferences file setting and # must be passed explicitly on the command line instead - gnupg_version_re = re.compile('gpg .* ([12])\.') - gnupg_version = base._run_cmd(['gpg', '--version'], tempdir.path) - for line in gnupg_version[0].split('\n'): - gnupg_version = gnupg_version_re.match(line) - if gnupg_version: - gnupg_version = gnupg_version.group(1) - break - if gnupg_version == '1': + if gnupg_version[0] == 1: gnupg_random = '--quick-random' - elif gnupg_version == '2': + elif gnupg_version[0] >= 2: gnupg_random = '--debug-quick-random' else: gnupg_random = '' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/pbr/tests/test_setup.py new/pbr-1.1.0/pbr/tests/test_setup.py --- old/pbr-1.0.1/pbr/tests/test_setup.py 2015-05-20 00:36:58.000000000 +0200 +++ new/pbr-1.1.0/pbr/tests/test_setup.py 2015-06-09 05:14:39.000000000 +0200 @@ -195,6 +195,7 @@ ('true_autodoc_caps_with_excludes', dict(has_opt=True, autodoc='True', has_autodoc=True, excludes="fake_package.fake_private_module\n" + "fake_package.another_fake_*\n" "fake_package.unknown_module")), ('true_autodoc_lower', dict(has_opt=True, autodoc='true', has_autodoc=True)), @@ -216,6 +217,7 @@ "source_dir": ["a", "."]} pkg_fixture = fixtures.PythonPackage( "fake_package", [("fake_module.py", b""), + ("another_fake_module_for_testing.py", b""), ("fake_private_module.py", b"")]) self.useFixture(pkg_fixture) self.useFixture(base.DiveDir(pkg_fixture.base)) @@ -224,6 +226,7 @@ self.distr.command_options["pbr"]["autodoc_exclude_modules"] = ( 'setup.cfg', "fake_package.fake_private_module\n" + "fake_package.another_fake_*\n" "fake_package.unknown_module") if self.has_opt: options = self.distr.command_options["pbr"] @@ -245,6 +248,9 @@ assertion( os.path.exists( "api/fake_package.fake_private_module.rst")) + assertion( + os.path.exists( + "api/fake_package.another_fake_module_for_testing.rst")) def test_builders_config(self): build_doc = packaging.LocalBuildDoc(self.distr) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/pbr.egg-info/PKG-INFO new/pbr-1.1.0/pbr.egg-info/PKG-INFO --- old/pbr-1.0.1/pbr.egg-info/PKG-INFO 2015-05-20 00:37:15.000000000 +0200 +++ new/pbr-1.1.0/pbr.egg-info/PKG-INFO 2015-06-09 05:14:57.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: pbr -Version: 1.0.1 +Version: 1.1.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.0.1/pbr.egg-info/pbr.json new/pbr-1.1.0/pbr.egg-info/pbr.json --- old/pbr-1.0.1/pbr.egg-info/pbr.json 2015-05-20 00:37:15.000000000 +0200 +++ new/pbr-1.1.0/pbr.egg-info/pbr.json 2015-06-09 05:14:57.000000000 +0200 @@ -1 +1 @@ -{"is_release": true, "git_version": "b72e446"} \ No newline at end of file +{"git_version": "dceb9e5", "is_release": true} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/setup.cfg new/pbr-1.1.0/setup.cfg --- old/pbr-1.0.1/setup.cfg 2015-05-20 00:37:15.000000000 +0200 +++ new/pbr-1.1.0/setup.cfg 2015-06-09 05:14:57.000000000 +0200 @@ -53,7 +53,7 @@ universal = 1 [egg_info] -tag_build = tag_svn_revision = 0 +tag_build = tag_date = 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/test-requirements.txt new/pbr-1.1.0/test-requirements.txt --- old/pbr-1.0.1/test-requirements.txt 2015-05-20 00:36:59.000000000 +0200 +++ new/pbr-1.1.0/test-requirements.txt 2015-06-09 05:14:39.000000000 +0200 @@ -1,13 +1,16 @@ +# 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. coverage>=3.6 discover fixtures>=0.3.14 hacking>=0.10.0,<0.11 mock>=1.0 python-subunit>=0.0.18 -sphinx>=1.1.2,<1.2 +sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 six>=1.9.0 testrepository>=0.0.18 testresources>=0.2.4 testscenarios>=0.4 -testtools>=0.9.34 +testtools>=0.9.36,!=1.2.0 virtualenv diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-1.0.1/tools/integration.sh new/pbr-1.1.0/tools/integration.sh --- old/pbr-1.0.1/tools/integration.sh 2015-05-20 00:36:58.000000000 +0200 +++ new/pbr-1.1.0/tools/integration.sh 2015-06-09 05:14:39.000000000 +0200 @@ -30,7 +30,7 @@ # TODO: Figure out how to get this on to the box properly sudo apt-get update -sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libzmq-dev libffi-dev libldap2-dev libsasl2-dev ccache +sudo apt-get install -y --force-yes libvirt-dev libxml2-dev libxslt-dev libmysqlclient-dev libpq-dev libnspr4-dev pkg-config libsqlite3-dev libzmq-dev libffi-dev libldap2-dev libsasl2-dev ccache libkrb5-dev # FOR numpy / pyyaml sudo apt-get build-dep -y --force-yes python-numpy
