Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-pbr for openSUSE:Factory checked in at 2023-01-23 18:30:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-pbr (Old) and /work/SRC/openSUSE:Factory/.python-pbr.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pbr" Mon Jan 23 18:30:41 2023 rev:62 rq:1060114 version:5.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-pbr/python-pbr.changes 2022-10-29 20:17:07.534216683 +0200 +++ /work/SRC/openSUSE:Factory/.python-pbr.new.32243/python-pbr.changes 2023-01-23 18:30:42.739598652 +0100 @@ -1,0 +2,9 @@ +Sat Jan 21 09:57:57 UTC 2023 - Dirk Müller <[email protected]> + +- update to 5.11.1: + * Run PBR integration on Ubuntu Focal too + * Remove numpy dependencies + * Tie recursion calls to Dist object, not module + * Update tox.ini to work with tox 4 + +------------------------------------------------------------------- Old: ---- pbr-5.11.0.tar.gz New: ---- pbr-5.11.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-pbr.spec ++++++ --- /var/tmp/diff_new_pack.9C21XV/_old 2023-01-23 18:30:43.315602207 +0100 +++ /var/tmp/diff_new_pack.9C21XV/_new 2023-01-23 18:30:43.319602232 +0100 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %bcond_with test %endif Name: python-pbr%{psuffix} -Version: 5.11.0 +Version: 5.11.1 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 ++++++ pbr-5.11.0.tar.gz -> pbr-5.11.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.11.0/.zuul.yaml new/pbr-5.11.1/.zuul.yaml --- old/pbr-5.11.0/.zuul.yaml 2022-10-20 13:02:15.000000000 +0200 +++ new/pbr-5.11.1/.zuul.yaml 2023-01-11 11:03:56.000000000 +0100 @@ -104,6 +104,14 @@ vars: pbr_pip_version: 'git+https://github.com/pypa/pip.git#egg=pip' +- job: + name: pbr-installation-openstack-focal + parent: pbr-installation-openstack + nodeset: ubuntu-focal + description: | + Run pbr integration testing on older Ubuntu which allows us + to test compatibility with older versions of pip and setuptools. + - project: templates: - lib-forward-testing @@ -120,6 +128,7 @@ - openstack-tox-py38 - openstack-tox-py39 - pbr-installation-openstack + - pbr-installation-openstack-focal - pbr-installation-openstack-pip-dev - tempest-full: override-checkout: stable/train @@ -133,6 +142,7 @@ - openstack-tox-py38 - openstack-tox-py39 - pbr-installation-openstack + - pbr-installation-openstack-focal - pbr-installation-openstack-pip-dev - tempest-full: override-checkout: stable/train diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.11.0/ChangeLog new/pbr-5.11.1/ChangeLog --- old/pbr-5.11.0/ChangeLog 2022-10-20 13:02:42.000000000 +0200 +++ new/pbr-5.11.1/ChangeLog 2023-01-11 11:04:21.000000000 +0100 @@ -1,6 +1,14 @@ CHANGES ======= +5.11.1 +------ + +* Run PBR integration on Ubuntu Focal too +* Remove numpy dependencies +* Tie recursion calls to Dist object, not module +* Update tox.ini to work with tox 4 + 5.11.0 ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.11.0/PKG-INFO new/pbr-5.11.1/PKG-INFO --- old/pbr-5.11.0/PKG-INFO 2022-10-20 13:02:42.879536000 +0200 +++ new/pbr-5.11.1/PKG-INFO 2023-01-11 11:04:21.909961000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pbr -Version: 5.11.0 +Version: 5.11.1 Summary: Python Build Reasonableness Home-page: https://docs.openstack.org/pbr/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.11.0/pbr/core.py new/pbr-5.11.1/pbr/core.py --- old/pbr-5.11.0/pbr/core.py 2022-10-20 13:02:15.000000000 +0200 +++ new/pbr-5.11.1/pbr/core.py 2023-01-11 11:03:56.000000000 +0100 @@ -61,11 +61,6 @@ integer_types = (int, long) # noqa -# We use this canary to detect whether the module has already been called, -# in order to avoid recursion -in_use = False - - def pbr(dist, attr, value): """Implements the actual pbr setup() keyword. @@ -91,10 +86,9 @@ # particularly when using PEP517 build-system configs without # setup_requires in setup.py. We can avoid the recursion by setting # this canary so we don't repeat ourselves. - global in_use - if in_use: + if hasattr(dist, '_pbr_initialized'): return - in_use = True + dist._pbr_initialized = True if not value: return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.11.0/pbr/tests/test_integration.py new/pbr-5.11.1/pbr/tests/test_integration.py --- old/pbr-5.11.0/pbr/tests/test_integration.py 2022-10-20 13:02:15.000000000 +0200 +++ new/pbr-5.11.1/pbr/tests/test_integration.py 2023-01-11 11:03:56.000000000 +0100 @@ -210,20 +210,24 @@ scenarios = [ ('pip-latest', {'modules': ['pip']}), - ('setuptools-Bionic', { - 'modules': ['pip==9.0.1', 'setuptools==39.0.1']}), - ('setuptools-Stretch', { - 'modules': ['pip==9.0.1', 'setuptools==33.1.1']}), - ('setuptools-EL8', {'modules': ['pip==9.0.3', 'setuptools==39.2.0']}), - ('setuptools-Buster', { - 'modules': ['pip==18.1', 'setuptools==40.8.0']}), - ('setuptools-Focal', { - 'modules': ['pip==20.0.2', 'setuptools==45.2.0']}), + ( + 'setuptools-Bullseye', + {'modules': ['pip==20.3.4', 'setuptools==52.0.0']}, + ), + ( + 'setuptools-Focal', + {'modules': ['pip==20.0.2', 'setuptools==45.2.0']}, + ), + ( + 'setuptools-Jammy', + {'modules': ['pip==22.0.2', 'setuptools==59.6.0']}, + ), ] @testtools.skipUnless( os.environ.get('PBR_INTEGRATION', None) == '1', - 'integration tests not enabled') + 'integration tests not enabled', + ) def test_pip_versions(self): pkgs = { 'test_markers': @@ -260,21 +264,33 @@ allow_fail=False)[0]) -class TestLTSSupport(base.BaseTestCase): - - # These versions come from the versions installed from the 'virtualenv' - # command from the 'python-virtualenv' package. - scenarios = [ +# Handle collections.abc moves in python breaking old pip +# These versions come from the versions installed from the 'virtualenv' +# command from the 'python-virtualenv' package. +if sys.version_info[0:3] < (3, 10, 0): + lts_scenarios = [ ('Bionic', {'modules': ['pip==9.0.1', 'setuptools==39.0.1']}), ('Stretch', {'modules': ['pip==9.0.1', 'setuptools==33.1.1']}), ('EL8', {'modules': ['pip==9.0.3', 'setuptools==39.2.0']}), ('Buster', {'modules': ['pip==18.1', 'setuptools==40.8.0']}), ('Focal', {'modules': ['pip==20.0.2', 'setuptools==45.2.0']}), ] +else: + lts_scenarios = [ + ('Bullseye', {'modules': ['pip==20.3.4', 'setuptools==52.0.0']}), + ('Focal', {'modules': ['pip==20.0.2', 'setuptools==45.2.0']}), + ('Jammy', {'modules': ['pip==22.0.2', 'setuptools==59.6.0']}), + ] + + +class TestLTSSupport(base.BaseTestCase): + + scenarios = lts_scenarios @testtools.skipUnless( os.environ.get('PBR_INTEGRATION', None) == '1', - 'integration tests not enabled') + 'integration tests not enabled', + ) def test_lts_venv_default_versions(self): venv = self.useFixture( test_packaging.Venv('setuptools', modules=self.modules)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.11.0/pbr.egg-info/PKG-INFO new/pbr-5.11.1/pbr.egg-info/PKG-INFO --- old/pbr-5.11.0/pbr.egg-info/PKG-INFO 2022-10-20 13:02:42.000000000 +0200 +++ new/pbr-5.11.1/pbr.egg-info/PKG-INFO 2023-01-11 11:04:21.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: pbr -Version: 5.11.0 +Version: 5.11.1 Summary: Python Build Reasonableness Home-page: https://docs.openstack.org/pbr/latest/ Author: OpenStack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.11.0/tools/integration.sh new/pbr-5.11.1/tools/integration.sh --- old/pbr-5.11.0/tools/integration.sh 2022-10-20 13:02:15.000000000 +0200 +++ new/pbr-5.11.1/tools/integration.sh 2023-01-11 11:03:56.000000000 +0100 @@ -32,15 +32,8 @@ 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 libffi-dev libldap2-dev libsasl2-dev ccache libkrb5-dev liberasurecode-dev libjpeg-dev libsystemd-dev libnss3-dev libssl-dev -# FOR numpy / pyyaml -# The source list has been removed from our apt config so rather than -# installing deps via apt-get build-dep <PKG> we install the lists provied -# by apt-cache showsrc <PKG> - -# Numpy -sudo apt-get install -y --force-yes cython debhelper gfortran libblas-dev liblapack-dev python-all-dbg python-all-dev python-nose python-tz python3-all-dbg python3-all-dev python3-nose python3-tz -#pyyaml -sudo apt-get install -y --force-yes debhelper python-all-dev python-all-dbg python3-all-dev python3-all-dbg libyaml-dev cython cython-dbg quilt +# FOR pyyaml +sudo apt-get install -y --force-yes debhelper python3-all-dev python3-all-dbg libyaml-dev cython3 cython3-dbg quilt # And use ccache explitly export PATH=/usr/lib/ccache:$PATH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pbr-5.11.0/tox.ini new/pbr-5.11.1/tox.ini --- old/pbr-5.11.0/tox.ini 2022-10-20 13:02:15.000000000 +0200 +++ new/pbr-5.11.1/tox.ini 2023-01-11 11:03:56.000000000 +0100 @@ -1,12 +1,17 @@ [tox] minversion = 3.18.0 -envlist = pep8,py27,py37,docs -ignore_basepython_conflict = True +envlist = pep8,py3,docs [testenv] -usedevelop = True -basepython = python3 -passenv = PBR_INTEGRATION PIPFLAGS PIPVERSION PBRVERSION REPODIR WHEELHOUSE PROJECTS +usedevelop = true +passenv = + PBR_INTEGRATION + PIPFLAGS + PIPVERSION + PBRVERSION + REPODIR + WHEELHOUSE + PROJECTS # TODO(fungi): drop distutils override once logging improves in Setuptools # https://github.com/pypa/setuptools/issues/3038 setenv = @@ -24,7 +29,8 @@ commands = pre-commit run -a [testenv:docs] -allowlist_externals = rm +allowlist_externals = + rm deps = -r{toxinidir}/doc/requirements.txt commands = @@ -33,7 +39,8 @@ sphinx-build -W -b html doc/source doc/build/html {posargs} [testenv:releasenotes] -allowlist_externals = rm +allowlist_externals = + rm deps = {[testenv:docs]deps} commands = rm -rf releasenotes/build
