Hello community, here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2018-10-18 15:30:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pbr (Old) and /work/SRC/openSUSE:Factory/.python-pbr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pbr" Thu Oct 18 15:30:40 2018 rev:40 rq:642405 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pbr/python-pbr.changes 2018-09-26 14:53:07.839133908 +0200 +++ /work/SRC/openSUSE:Factory/.python-pbr.new/python-pbr.changes 2018-10-18 15:30:44.702686512 +0200 @@ -1,0 +2,28 @@ +Mon Oct 15 13:23:36 UTC 2018 - Matej Cepl <[email protected]> + +- Update to 4.3.0: + * Remove my\_ip from generated wsgi script + * Fix typo in contribution instructions + * Add release note for fix to bug 1786306 + * Move pbr-installation jobs in-tree + * Support subdirectory in the url + * remove pypy jobs + * add lib-forward-testing-python3 test job + * add python 3.6 unit test job + * switch documentation job to new PTI + * import zuul job settings from project-config + * Ignore Zuul when generating AUTHORS + * tox: Re-add cover target +- Add new_wheel.patch to make compatible with wheel = 0.32.1 + +------------------------------------------------------------------- +Sun Oct 7 08:43:14 CEST 2018 - [email protected] + +- Revert previous commit. + +------------------------------------------------------------------- +Sun Oct 7 06:34:26 UTC 2018 - Matěj Cepl <[email protected]> + +- Partially switch off tests requiring testscenarios and stestr. + +------------------------------------------------------------------- Old: ---- pbr-4.2.0.tar.gz New: ---- new_wheel.patch pbr-4.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pbr.spec ++++++ --- /var/tmp/diff_new_pack.LWBlAT/_old 2018-10-18 15:30:45.274685844 +0200 +++ /var/tmp/diff_new_pack.LWBlAT/_new 2018-10-18 15:30:45.278685839 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -28,7 +28,7 @@ %else Name: python-pbr-%{flavor} %endif -Version: 4.2.0 +Version: 4.3.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -36,6 +36,7 @@ URL: http://pypi.python.org/pypi/pbr Source: https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz Patch0: 0001-Skip-test-for-testr-hook-being-installed-when-testr-.patch +Patch1: new_wheel.patch BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -70,7 +71,7 @@ %prep %setup -q -n pbr-%{version} -%patch0 -p1 +%autopatch -p1 # Get rid of ugly build-time deps that require network: sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py ++++++ new_wheel.patch ++++++ --- a/pbr/tests/test_packaging.py +++ b/pbr/tests/test_packaging.py @@ -41,6 +41,7 @@ import email import email.errors import imp +import logging import os import re import sys @@ -56,8 +57,11 @@ import testscenarios import testtools from testtools import matchers import virtualenv -import wheel.install +try: + from wheel.install import WheelFile +except ImportError: + from wheel.wheelfile import WheelFile from pbr import git from pbr import packaging from pbr.tests import base @@ -372,13 +376,15 @@ class TestPackagingWheels(base.BaseTestC relative_wheel_filename = os.listdir(dist_dir)[0] absolute_wheel_filename = os.path.join( dist_dir, relative_wheel_filename) - wheel_file = wheel.install.WheelFile(absolute_wheel_filename) - wheel_name = wheel_file.parsed_filename.group('namever') - # Create a directory path to unpack the wheel to - self.extracted_wheel_dir = os.path.join(dist_dir, wheel_name) - # Extract the wheel contents to the directory we just created - wheel_file.zipfile.extractall(self.extracted_wheel_dir) - wheel_file.zipfile.close() + with WheelFile(absolute_wheel_filename) as wheel_file: + wheel_name = wheel_file.parsed_filename.group('namever') + # Create a directory path to unpack the wheel to + self.extracted_wheel_dir = os.path.join(dist_dir, wheel_name) + # Extract the wheel contents to the directory we just created + if hasattr(wheel_file, 'zipfile'): + wheel_file.zipfile.extractall(self.extracted_wheel_dir) + else: + wheel_file.extractall(self.extracted_wheel_dir) def test_data_directory_has_wsgi_scripts(self): # Build the path to the scripts directory @@ -402,8 +409,10 @@ class TestPackagingWheels(base.BaseTestC static_object_path = os.path.join( built_package_dir, static_object_filename) - self.assertTrue(os.path.exists(built_package_dir)) - self.assertTrue(os.path.exists(static_object_path)) + self.assertTrue(os.path.exists(built_package_dir), + 'built_package_dir %s not found!' % built_package_dir) + self.assertTrue(os.path.exists(static_object_path), + 'static_object_path %s not found!' % static_object_path) class TestPackagingHelpers(testtools.TestCase): ++++++ pbr-4.2.0.tar.gz -> pbr-4.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/.zuul.yaml new/pbr-4.3.0/.zuul.yaml --- old/pbr-4.2.0/.zuul.yaml 2018-07-24 00:21:00.000000000 +0200 +++ new/pbr-4.3.0/.zuul.yaml 2018-10-03 11:34:38.000000000 +0200 @@ -1,7 +1,127 @@ +- job: + name: pbr-installation-devstack-base + parent: legacy-dsvm-base + timeout: 7800 + required-projects: + - openstack-dev/devstack + - openstack-dev/grenade + - openstack-dev/pbr + - openstack-infra/devstack-gate + - openstack-infra/tripleo-ci + - openstack/aodh + - openstack/automaton + - openstack/ceilometer + - openstack/ceilometermiddleware + - openstack/cinder + - openstack/cliff + - openstack/debtcollector + - openstack/dib-utils + - openstack/diskimage-builder + - openstack/django_openstack_auth + - openstack/futurist + - openstack/glance + - openstack/glance_store + - openstack/heat + - openstack/heat-cfntools + - openstack/heat-templates + - openstack/horizon + - openstack/ironic + - openstack/ironic-lib + - openstack/ironic-python-agent + - openstack/keystone + - openstack/keystoneauth + - openstack/keystonemiddleware + - openstack/manila + - openstack/manila-ui + - openstack/neutron + - openstack/neutron-fwaas + - openstack/neutron-lbaas + - openstack/neutron-vpnaas + - openstack/nova + - openstack/octavia + - openstack/os-apply-config + - openstack/os-brick + - openstack/os-client-config + - openstack/os-collect-config + - openstack/os-net-config + - openstack/os-refresh-config + - openstack/osc-lib + - openstack/oslo.cache + - openstack/oslo.concurrency + - openstack/oslo.config + - openstack/oslo.context + - openstack/oslo.db + - openstack/oslo.i18n + - openstack/oslo.log + - openstack/oslo.messaging + - openstack/oslo.middleware + - openstack/oslo.policy + - openstack/oslo.reports + - openstack/oslo.rootwrap + - openstack/oslo.serialization + - openstack/oslo.service + - openstack/oslo.utils + - openstack/oslo.versionedobjects + - openstack/oslo.vmware + - openstack/pycadf + - openstack/python-cinderclient + - openstack/python-glanceclient + - openstack/python-heatclient + - openstack/python-ironicclient + - openstack/python-keystoneclient + - openstack/python-manilaclient + - openstack/python-neutronclient + - openstack/python-novaclient + - openstack/python-openstackclient + - openstack/python-saharaclient + - openstack/python-swiftclient + - openstack/python-troveclient + - openstack/python-zaqarclient + - openstack/requirements + - openstack/sahara + - openstack/sahara-dashboard + - openstack/stevedore + - openstack/swift + - openstack/taskflow + - openstack/tempest + - openstack/tooz + - openstack/tripleo-heat-templates + - openstack/tripleo-image-elements + - openstack/trove + - openstack/trove-dashboard + - openstack/zaqar + +- job: + name: pbr-installation-devstack + parent: pbr-installation-devstack-base + run: playbooks/legacy/pbr-installation-devstack/run.yaml + post-run: playbooks/legacy/pbr-installation-devstack/post.yaml + +- job: + name: pbr-installation-upstream-devstack + parent: pbr-installation-devstack-base + run: playbooks/legacy/pbr-installation-upstream-devstack/run.yaml + post-run: playbooks/legacy/pbr-installation-upstream-devstack/post.yaml + - project: + templates: + - openstack-python-jobs + - openstack-python35-jobs + - openstack-python36-jobs + - lib-forward-testing + - lib-forward-testing-python3 + - publish-openstack-docs-pti + - periodic-stable-jobs check: jobs: - openstack-tox-lower-constraints + - pbr-installation-devstack + - pbr-installation-upstream-devstack gate: jobs: - openstack-tox-lower-constraints + - pbr-installation-devstack + - pbr-installation-upstream-devstack + post: + jobs: + - openstack-tox-cover diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/AUTHORS new/pbr-4.3.0/AUTHORS --- old/pbr-4.2.0/AUTHORS 2018-07-24 00:25:13.000000000 +0200 +++ new/pbr-4.3.0/AUTHORS 2018-10-03 11:37:09.000000000 +0200 @@ -16,6 +16,7 @@ Cao Xuan Hoang <[email protected]> Chang Bo Guo <[email protected]> ChangBo Guo(gcb) <[email protected]> +Chris Dent <[email protected]> Christian Berendt <[email protected]> Chuck Short <[email protected]> Clark Boylan <[email protected]> @@ -80,6 +81,7 @@ Michael Basnight <[email protected]> Michael Still <[email protected]> Mike Heald <[email protected]> +Moises Guimaraes de Medeiros <[email protected]> Monty Taylor <[email protected]> Nikhil Manchanda <[email protected]> Octavian Ciuhandu <[email protected]> @@ -114,17 +116,18 @@ Thomas Herve <[email protected]> Thomas Leaman <[email protected]> Thomas Morin <[email protected]> +Tim Burke <[email protected]> Tim Simpson <[email protected]> Timothy Chavez <[email protected]> Toilal <[email protected]> Vasudev Kamath <[email protected]> Vincent Untz <[email protected]> Vishvananda Ishaya <[email protected]> +Wei Tie <[email protected]> YAMAMOTO Takashi <[email protected]> Yaguang Tang <[email protected]> Yuriy Taraday <[email protected]> Zhongyue Luo <[email protected]> -Zuul <[email protected]> alexpilotti <[email protected]> [email protected] <[email protected]> dineshbhor <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/ChangeLog new/pbr-4.3.0/ChangeLog --- old/pbr-4.2.0/ChangeLog 2018-07-24 00:25:13.000000000 +0200 +++ new/pbr-4.3.0/ChangeLog 2018-10-03 11:37:09.000000000 +0200 @@ -1,6 +1,22 @@ CHANGES ======= +4.3.0 +----- + +* Remove my\_ip from generated wsgi script +* Fix typo in contribution instructions +* Add release note for fix to bug 1786306 +* Move pbr-installation jobs in-tree +* Support subdirectory in the url +* remove pypy jobs +* add lib-forward-testing-python3 test job +* add python 3.6 unit test job +* switch documentation job to new PTI +* import zuul job settings from project-config +* Ignore Zuul when generating AUTHORS +* tox: Re-add cover target + 4.2.0 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/PKG-INFO new/pbr-4.3.0/PKG-INFO --- old/pbr-4.2.0/PKG-INFO 2018-07-24 00:25:14.000000000 +0200 +++ new/pbr-4.3.0/PKG-INFO 2018-10-03 11:37:09.000000000 +0200 @@ -1,14 +1,14 @@ Metadata-Version: 2.1 Name: pbr -Version: 4.2.0 +Version: 4.3.0 Summary: Python Build Reasonableness Home-page: https://docs.openstack.org/pbr/latest/ Author: OpenStack Author-email: [email protected] License: UNKNOWN +Project-URL: Documentation, https://docs.openstack.org/pbr/ Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/ Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/ -Project-URL: Documentation, https://docs.openstack.org/pbr/ Description: Introduction ============ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/doc/source/contributor/index.rst new/pbr-4.3.0/doc/source/contributor/index.rst --- old/pbr-4.2.0/doc/source/contributor/index.rst 2018-07-24 00:21:00.000000000 +0200 +++ new/pbr-4.3.0/doc/source/contributor/index.rst 2018-10-03 11:34:38.000000000 +0200 @@ -27,7 +27,7 @@ pip install -r requirements.txt -r test-requirements.txt -In you go this route, you can interact with the testr command directly. +If you go this route, you can interact with the testr command directly. Running ``testr run`` will run the entire test suite. ``testr run --parallel`` will run it in parallel (this is the default incantation tox uses). More information about testr can be found at: http://wiki.openstack.org/testr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/pbr/git.py new/pbr-4.3.0/pbr/git.py --- old/pbr-4.2.0/pbr/git.py 2018-07-24 00:21:00.000000000 +0200 +++ new/pbr-4.3.0/pbr/git.py 2018-10-03 11:34:38.000000000 +0200 @@ -300,7 +300,7 @@ and not os.access(new_authors, os.W_OK)): return log.info('[pbr] Generating AUTHORS') - ignore_emails = '(jenkins@review|infra@lists|jenkins@openstack)' + ignore_emails = '((jenkins|zuul)@review|infra@lists|jenkins@openstack)' if git_dir is None: git_dir = _get_git_directory() if git_dir: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/pbr/packaging.py new/pbr-4.3.0/pbr/packaging.py --- old/pbr-4.2.0/pbr/packaging.py 2018-07-24 00:21:00.000000000 +0200 +++ new/pbr-4.3.0/pbr/packaging.py 2018-10-03 11:34:38.000000000 +0200 @@ -137,13 +137,15 @@ # such as: # -e git://github.com/openstack/nova/master#egg=nova # -e git://github.com/openstack/nova/master#egg=nova-1.2.3 + # -e git+https://foo.com/zipball#egg=bar&subdirectory=baz if re.match(r'\s*-e\s+', line): - line = re.sub(r'\s*-e\s+.*#egg=(.*)$', egg_fragment, line) + line = re.sub(r'\s*-e\s+.*#egg=([^&]+).*$', egg_fragment, line) # such as: # http://github.com/openstack/nova/zipball/master#egg=nova # http://github.com/openstack/nova/zipball/master#egg=nova-1.2.3 + # git+https://foo.com/zipball#egg=bar&subdirectory=baz elif re.match(r'\s*(https?|git(\+(https|ssh))?):', line): - line = re.sub(r'\s*(https?|git(\+(https|ssh))?):.*#egg=(.*)$', + line = re.sub(r'\s*(https?|git(\+(https|ssh))?):.*#egg=([^&]+).*$', egg_fragment, line) # -f lines are for index locations, and don't get used here elif re.match(r'\s*-f\s+', line): @@ -310,8 +312,6 @@ import sys import wsgiref.simple_server as wss - my_ip = socket.gethostbyname(socket.gethostname()) - parser = argparse.ArgumentParser( description=%(import_target)s.__doc__, formatter_class=argparse.ArgumentDefaultsHelpFormatter, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/pbr/tests/test_packaging.py new/pbr-4.3.0/pbr/tests/test_packaging.py --- old/pbr-4.2.0/pbr/tests/test_packaging.py 2018-07-24 00:21:00.000000000 +0200 +++ new/pbr-4.3.0/pbr/tests/test_packaging.py 2018-10-03 11:34:38.000000000 +0200 @@ -579,6 +579,11 @@ ('versioned', {'versioned': True, 'expected': ['bar>=1.2.3']}) ] + subdirectory_scenarios = [ + ('non-subdirectory', {'has_subdirectory': False}), + ('has-subdirectory', {'has_subdirectory': True}) + ] + scenarios = [ ('normal', {'url': "foo\nbar", 'expected': ['foo', 'bar']}), ('normal_with_comments', { @@ -591,7 +596,7 @@ ('ssh_egg_url', {'url': 'git+ssh://foo.com/zipball#egg=bar'}), ('git_https_egg_url', {'url': 'git+https://foo.com/zipball#egg=bar'}), ('http_egg_url', {'url': 'https://foo.com/zipball#egg=bar'}), - ], versioned_scenarios) + ], versioned_scenarios, subdirectory_scenarios) scenarios = scenarios + testscenarios.multiply_scenarios( [ @@ -601,7 +606,7 @@ ('non-editable', {'editable': False}), ('editable', {'editable': True}), ], - versioned_scenarios) + versioned_scenarios, subdirectory_scenarios) def test_parse_requirements(self): tmp_file = tempfile.NamedTemporaryFile() @@ -610,6 +615,8 @@ req_string = ("-e %s" % req_string) if hasattr(self, 'versioned') and self.versioned: req_string = ("%s-1.2.3" % req_string) + if hasattr(self, 'has_subdirectory') and self.has_subdirectory: + req_string = ("%s&subdirectory=baz" % req_string) with open(tmp_file.name, 'w') as fh: fh.write(req_string) self.assertEqual(self.expected, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/pbr.egg-info/PKG-INFO new/pbr-4.3.0/pbr.egg-info/PKG-INFO --- old/pbr-4.2.0/pbr.egg-info/PKG-INFO 2018-07-24 00:25:13.000000000 +0200 +++ new/pbr-4.3.0/pbr.egg-info/PKG-INFO 2018-10-03 11:37:09.000000000 +0200 @@ -1,14 +1,14 @@ Metadata-Version: 2.1 Name: pbr -Version: 4.2.0 +Version: 4.3.0 Summary: Python Build Reasonableness Home-page: https://docs.openstack.org/pbr/latest/ Author: OpenStack Author-email: [email protected] License: UNKNOWN +Project-URL: Documentation, https://docs.openstack.org/pbr/ Project-URL: Bug Tracker, https://bugs.launchpad.net/pbr/ Project-URL: Source Code, https://git.openstack.org/cgit/openstack-dev/pbr/ -Project-URL: Documentation, https://docs.openstack.org/pbr/ Description: Introduction ============ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/pbr.egg-info/SOURCES.txt new/pbr-4.3.0/pbr.egg-info/SOURCES.txt --- old/pbr-4.2.0/pbr.egg-info/SOURCES.txt 2018-07-24 00:25:14.000000000 +0200 +++ new/pbr-4.3.0/pbr.egg-info/SOURCES.txt 2018-10-03 11:37:09.000000000 +0200 @@ -89,9 +89,14 @@ pbr/tests/testpackage/pbr_testpackage/package_data/1.txt pbr/tests/testpackage/pbr_testpackage/package_data/2.txt pbr/tests/testpackage/src/testext.c +playbooks/legacy/pbr-installation-devstack/post.yaml +playbooks/legacy/pbr-installation-devstack/run.yaml +playbooks/legacy/pbr-installation-upstream-devstack/post.yaml +playbooks/legacy/pbr-installation-upstream-devstack/run.yaml releasenotes/notes/deprecate-pyN-requirements-364655c38fa5b780.yaml releasenotes/notes/deprecate-testr-nose-integration-56e3e11248d946fc.yaml releasenotes/notes/remove-command-hooks-907d9c2325f306ca.yaml +releasenotes/notes/support-vcs-uris-with-subdirectories-20ad68b6138f72ca.yaml releasenotes/notes/v_version-457b38c8679c5868.yaml releasenotes/source/conf.py releasenotes/source/index.rst diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/playbooks/legacy/pbr-installation-devstack/post.yaml new/pbr-4.3.0/playbooks/legacy/pbr-installation-devstack/post.yaml --- old/pbr-4.2.0/playbooks/legacy/pbr-installation-devstack/post.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/pbr-4.3.0/playbooks/legacy/pbr-installation-devstack/post.yaml 2018-10-03 11:34:38.000000000 +0200 @@ -0,0 +1,15 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/logs/** + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/playbooks/legacy/pbr-installation-devstack/run.yaml new/pbr-4.3.0/playbooks/legacy/pbr-installation-devstack/run.yaml --- old/pbr-4.2.0/playbooks/legacy/pbr-installation-devstack/run.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/pbr-4.3.0/playbooks/legacy/pbr-installation-devstack/run.yaml 2018-10-03 11:34:38.000000000 +0200 @@ -0,0 +1,137 @@ +- hosts: all + name: Autoconverted job legacy-pbr-installation-dsvm from old job gate-pbr-installation-dsvm-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + cat > clonemap.yaml << EOF + clonemap: + - name: openstack-infra/devstack-gate + dest: devstack-gate + EOF + /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ + git://git.openstack.org \ + openstack-infra/devstack-gate + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -e + set -x + # Define the entire projects list here so that what we + # test requirements against is independent of what d-g + # thinks is relevant. + export PROJECTS="openstack-infra/devstack-gate $PROJECTS" + export PROJECTS="openstack-dev/devstack $PROJECTS" + export PROJECTS="openstack-dev/grenade $PROJECTS" + export PROJECTS="openstack-dev/pbr $PROJECTS" + export PROJECTS="openstack-infra/tripleo-ci $PROJECTS" + export PROJECTS="openstack/aodh $PROJECTS" + export PROJECTS="openstack/automaton $PROJECTS" + export PROJECTS="openstack/ceilometer $PROJECTS" + export PROJECTS="openstack/ceilometermiddleware $PROJECTS" + export PROJECTS="openstack/cinder $PROJECTS" + export PROJECTS="openstack/cliff $PROJECTS" + export PROJECTS="openstack/debtcollector $PROJECTS" + export PROJECTS="openstack/dib-utils $PROJECTS" + export PROJECTS="openstack/diskimage-builder $PROJECTS" + export PROJECTS="openstack/django_openstack_auth $PROJECTS" + export PROJECTS="openstack/futurist $PROJECTS" + export PROJECTS="openstack/glance $PROJECTS" + export PROJECTS="openstack/glance_store $PROJECTS" + export PROJECTS="openstack/heat $PROJECTS" + export PROJECTS="openstack/heat-cfntools $PROJECTS" + export PROJECTS="openstack/heat-templates $PROJECTS" + export PROJECTS="openstack/horizon $PROJECTS" + export PROJECTS="openstack/ironic $PROJECTS" + export PROJECTS="openstack/ironic-lib $PROJECTS" + export PROJECTS="openstack/ironic-python-agent $PROJECTS" + export PROJECTS="openstack/keystone $PROJECTS" + export PROJECTS="openstack/keystoneauth $PROJECTS" + export PROJECTS="openstack/keystonemiddleware $PROJECTS" + export PROJECTS="openstack/manila $PROJECTS" + export PROJECTS="openstack/manila-ui $PROJECTS" + export PROJECTS="openstack/zaqar $PROJECTS" + export PROJECTS="openstack/neutron $PROJECTS" + export PROJECTS="openstack/neutron-fwaas $PROJECTS" + export PROJECTS="openstack/neutron-lbaas $PROJECTS" + export PROJECTS="openstack/octavia $PROJECTS" + export PROJECTS="openstack/neutron-vpnaas $PROJECTS" + export PROJECTS="openstack/nova $PROJECTS" + export PROJECTS="openstack/os-apply-config $PROJECTS" + export PROJECTS="openstack/os-brick $PROJECTS" + export PROJECTS="openstack/os-client-config $PROJECTS" + export PROJECTS="openstack/os-collect-config $PROJECTS" + export PROJECTS="openstack/os-net-config $PROJECTS" + export PROJECTS="openstack/os-refresh-config $PROJECTS" + export PROJECTS="openstack/osc-lib $PROJECTS" + export PROJECTS="openstack/oslo.cache $PROJECTS" + export PROJECTS="openstack/oslo.concurrency $PROJECTS" + export PROJECTS="openstack/oslo.config $PROJECTS" + export PROJECTS="openstack/oslo.context $PROJECTS" + export PROJECTS="openstack/oslo.db $PROJECTS" + export PROJECTS="openstack/oslo.i18n $PROJECTS" + export PROJECTS="openstack/oslo.log $PROJECTS" + export PROJECTS="openstack/oslo.messaging $PROJECTS" + export PROJECTS="openstack/oslo.middleware $PROJECTS" + export PROJECTS="openstack/oslo.policy $PROJECTS" + export PROJECTS="openstack/oslo.reports $PROJECTS" + export PROJECTS="openstack/oslo.rootwrap $PROJECTS" + export PROJECTS="openstack/oslo.utils $PROJECTS" + export PROJECTS="openstack/oslo.serialization $PROJECTS" + export PROJECTS="openstack/oslo.service $PROJECTS" + export PROJECTS="openstack/oslo.versionedobjects $PROJECTS" + export PROJECTS="openstack/oslo.vmware $PROJECTS" + export PROJECTS="openstack/pycadf $PROJECTS" + export PROJECTS="openstack/python-cinderclient $PROJECTS" + export PROJECTS="openstack/python-glanceclient $PROJECTS" + export PROJECTS="openstack/python-heatclient $PROJECTS" + export PROJECTS="openstack/python-ironicclient $PROJECTS" + export PROJECTS="openstack/python-keystoneclient $PROJECTS" + export PROJECTS="openstack/python-manilaclient $PROJECTS" + export PROJECTS="openstack/python-zaqarclient $PROJECTS" + export PROJECTS="openstack/python-neutronclient $PROJECTS" + export PROJECTS="openstack/python-novaclient $PROJECTS" + export PROJECTS="openstack/python-openstackclient $PROJECTS" + export PROJECTS="openstack/python-saharaclient $PROJECTS" + export PROJECTS="openstack/python-swiftclient $PROJECTS" + export PROJECTS="openstack/python-troveclient $PROJECTS" + export PROJECTS="openstack/requirements $PROJECTS" + export PROJECTS="openstack/sahara $PROJECTS" + export PROJECTS="openstack/sahara-dashboard $PROJECTS" + export PROJECTS="openstack/stevedore $PROJECTS" + export PROJECTS="openstack/swift $PROJECTS" + export PROJECTS="openstack/taskflow $PROJECTS" + export PROJECTS="openstack/tempest $PROJECTS" + export PROJECTS="openstack/tooz $PROJECTS" + export PROJECTS="openstack/tripleo-heat-templates $PROJECTS" + export PROJECTS="openstack/tripleo-image-elements $PROJECTS" + export PROJECTS="openstack/trove $PROJECTS" + export PROJECTS="openstack/trove-dashboard $PROJECTS" + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_EXERCISES=0 + export DEVSTACK_GATE_REQS_INTEGRATION=1 + export PIP_PROCESS_DEPENDENCY_LINKS=1 + if [ "" = "-upstream" ]; then + export PBR_PIP_VERSION=git+https://github.com/pypa/pip.git#egg=pip + fi + function gate_hook { + set -x + bash -xe $BASE/new/pbr/tools/integration.sh $(cat $BASE/new/requirements/projects.txt) + } + export -f gate_hook + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/playbooks/legacy/pbr-installation-upstream-devstack/post.yaml new/pbr-4.3.0/playbooks/legacy/pbr-installation-upstream-devstack/post.yaml --- old/pbr-4.2.0/playbooks/legacy/pbr-installation-upstream-devstack/post.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/pbr-4.3.0/playbooks/legacy/pbr-installation-upstream-devstack/post.yaml 2018-10-03 11:34:38.000000000 +0200 @@ -0,0 +1,15 @@ +- hosts: primary + tasks: + + - name: Copy files from {{ ansible_user_dir }}/workspace/ on node + synchronize: + src: '{{ ansible_user_dir }}/workspace/' + dest: '{{ zuul.executor.log_root }}' + mode: pull + copy_links: true + verify_host: true + rsync_opts: + - --include=/logs/** + - --include=*/ + - --exclude=* + - --prune-empty-dirs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml new/pbr-4.3.0/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml --- old/pbr-4.2.0/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/pbr-4.3.0/playbooks/legacy/pbr-installation-upstream-devstack/run.yaml 2018-10-03 11:34:38.000000000 +0200 @@ -0,0 +1,137 @@ +- hosts: all + name: Autoconverted job legacy-pbr-installation-dsvm-upstream from old job gate-pbr-installation-dsvm-upstream-ubuntu-xenial + tasks: + + - name: Ensure legacy workspace directory + file: + path: '{{ ansible_user_dir }}/workspace' + state: directory + + - shell: + cmd: | + set -e + set -x + cat > clonemap.yaml << EOF + clonemap: + - name: openstack-infra/devstack-gate + dest: devstack-gate + EOF + /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ + git://git.openstack.org \ + openstack-infra/devstack-gate + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' + + - shell: + cmd: | + set -e + set -x + # Define the entire projects list here so that what we + # test requirements against is independent of what d-g + # thinks is relevant. + export PROJECTS="openstack-infra/devstack-gate $PROJECTS" + export PROJECTS="openstack-dev/devstack $PROJECTS" + export PROJECTS="openstack-dev/grenade $PROJECTS" + export PROJECTS="openstack-dev/pbr $PROJECTS" + export PROJECTS="openstack-infra/tripleo-ci $PROJECTS" + export PROJECTS="openstack/aodh $PROJECTS" + export PROJECTS="openstack/automaton $PROJECTS" + export PROJECTS="openstack/ceilometer $PROJECTS" + export PROJECTS="openstack/ceilometermiddleware $PROJECTS" + export PROJECTS="openstack/cinder $PROJECTS" + export PROJECTS="openstack/cliff $PROJECTS" + export PROJECTS="openstack/debtcollector $PROJECTS" + export PROJECTS="openstack/dib-utils $PROJECTS" + export PROJECTS="openstack/diskimage-builder $PROJECTS" + export PROJECTS="openstack/django_openstack_auth $PROJECTS" + export PROJECTS="openstack/futurist $PROJECTS" + export PROJECTS="openstack/glance $PROJECTS" + export PROJECTS="openstack/glance_store $PROJECTS" + export PROJECTS="openstack/heat $PROJECTS" + export PROJECTS="openstack/heat-cfntools $PROJECTS" + export PROJECTS="openstack/heat-templates $PROJECTS" + export PROJECTS="openstack/horizon $PROJECTS" + export PROJECTS="openstack/ironic $PROJECTS" + export PROJECTS="openstack/ironic-lib $PROJECTS" + export PROJECTS="openstack/ironic-python-agent $PROJECTS" + export PROJECTS="openstack/keystone $PROJECTS" + export PROJECTS="openstack/keystoneauth $PROJECTS" + export PROJECTS="openstack/keystonemiddleware $PROJECTS" + export PROJECTS="openstack/manila $PROJECTS" + export PROJECTS="openstack/manila-ui $PROJECTS" + export PROJECTS="openstack/zaqar $PROJECTS" + export PROJECTS="openstack/neutron $PROJECTS" + export PROJECTS="openstack/neutron-fwaas $PROJECTS" + export PROJECTS="openstack/neutron-lbaas $PROJECTS" + export PROJECTS="openstack/octavia $PROJECTS" + export PROJECTS="openstack/neutron-vpnaas $PROJECTS" + export PROJECTS="openstack/nova $PROJECTS" + export PROJECTS="openstack/os-apply-config $PROJECTS" + export PROJECTS="openstack/os-brick $PROJECTS" + export PROJECTS="openstack/os-client-config $PROJECTS" + export PROJECTS="openstack/os-collect-config $PROJECTS" + export PROJECTS="openstack/os-net-config $PROJECTS" + export PROJECTS="openstack/os-refresh-config $PROJECTS" + export PROJECTS="openstack/osc-lib $PROJECTS" + export PROJECTS="openstack/oslo.cache $PROJECTS" + export PROJECTS="openstack/oslo.concurrency $PROJECTS" + export PROJECTS="openstack/oslo.config $PROJECTS" + export PROJECTS="openstack/oslo.context $PROJECTS" + export PROJECTS="openstack/oslo.db $PROJECTS" + export PROJECTS="openstack/oslo.i18n $PROJECTS" + export PROJECTS="openstack/oslo.log $PROJECTS" + export PROJECTS="openstack/oslo.messaging $PROJECTS" + export PROJECTS="openstack/oslo.middleware $PROJECTS" + export PROJECTS="openstack/oslo.policy $PROJECTS" + export PROJECTS="openstack/oslo.reports $PROJECTS" + export PROJECTS="openstack/oslo.rootwrap $PROJECTS" + export PROJECTS="openstack/oslo.utils $PROJECTS" + export PROJECTS="openstack/oslo.serialization $PROJECTS" + export PROJECTS="openstack/oslo.service $PROJECTS" + export PROJECTS="openstack/oslo.versionedobjects $PROJECTS" + export PROJECTS="openstack/oslo.vmware $PROJECTS" + export PROJECTS="openstack/pycadf $PROJECTS" + export PROJECTS="openstack/python-cinderclient $PROJECTS" + export PROJECTS="openstack/python-glanceclient $PROJECTS" + export PROJECTS="openstack/python-heatclient $PROJECTS" + export PROJECTS="openstack/python-ironicclient $PROJECTS" + export PROJECTS="openstack/python-keystoneclient $PROJECTS" + export PROJECTS="openstack/python-manilaclient $PROJECTS" + export PROJECTS="openstack/python-zaqarclient $PROJECTS" + export PROJECTS="openstack/python-neutronclient $PROJECTS" + export PROJECTS="openstack/python-novaclient $PROJECTS" + export PROJECTS="openstack/python-openstackclient $PROJECTS" + export PROJECTS="openstack/python-saharaclient $PROJECTS" + export PROJECTS="openstack/python-swiftclient $PROJECTS" + export PROJECTS="openstack/python-troveclient $PROJECTS" + export PROJECTS="openstack/requirements $PROJECTS" + export PROJECTS="openstack/sahara $PROJECTS" + export PROJECTS="openstack/sahara-dashboard $PROJECTS" + export PROJECTS="openstack/stevedore $PROJECTS" + export PROJECTS="openstack/swift $PROJECTS" + export PROJECTS="openstack/taskflow $PROJECTS" + export PROJECTS="openstack/tempest $PROJECTS" + export PROJECTS="openstack/tooz $PROJECTS" + export PROJECTS="openstack/tripleo-heat-templates $PROJECTS" + export PROJECTS="openstack/tripleo-image-elements $PROJECTS" + export PROJECTS="openstack/trove $PROJECTS" + export PROJECTS="openstack/trove-dashboard $PROJECTS" + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_EXERCISES=0 + export DEVSTACK_GATE_REQS_INTEGRATION=1 + export PIP_PROCESS_DEPENDENCY_LINKS=1 + if [ "-upstream" = "-upstream" ]; then + export PBR_PIP_VERSION=git+https://github.com/pypa/pip.git#egg=pip + fi + function gate_hook { + set -x + bash -xe $BASE/new/pbr/tools/integration.sh $(cat $BASE/new/requirements/projects.txt) + } + export -f gate_hook + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + executable: /bin/bash + chdir: '{{ ansible_user_dir }}/workspace' + environment: '{{ zuul | zuul_legacy_vars }}' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/releasenotes/notes/support-vcs-uris-with-subdirectories-20ad68b6138f72ca.yaml new/pbr-4.3.0/releasenotes/notes/support-vcs-uris-with-subdirectories-20ad68b6138f72ca.yaml --- old/pbr-4.2.0/releasenotes/notes/support-vcs-uris-with-subdirectories-20ad68b6138f72ca.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/pbr-4.3.0/releasenotes/notes/support-vcs-uris-with-subdirectories-20ad68b6138f72ca.yaml 2018-10-03 11:34:38.000000000 +0200 @@ -0,0 +1,11 @@ +--- +features: + - | + Subdirectories can now be included when specfifying a requirement in + ``requirements.txt`` or ``test-requirements.txt`` using VCS URIs. For + example: + + -e git+https://foo.com/zipball#egg=bar&subdirectory=baz + + For more information, refer to the `pip documentation + <https://pip.pypa.io/en/latest/reference/pip_install/#vcs-support>`__. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-4.2.0/tox.ini new/pbr-4.3.0/tox.ini --- old/pbr-4.2.0/tox.ini 2018-07-24 00:21:00.000000000 +0200 +++ new/pbr-4.3.0/tox.ini 2018-10-03 11:34:38.000000000 +0200 @@ -31,6 +31,16 @@ basepython = python3 commands = {posargs} +[testenv:cover] +basepython = python3 +setenv = + PYTHON=coverage run --source pbr --parallel-mode +commands = + stestr run {posargs} + coverage combine + coverage html -d cover + coverage xml -o cover/coverage.xml + [flake8] # H405 multi line docstring summary not separated with an empty line # H904 "Wrap lines in parentheses and not a backslash for line continuation
