Accepting request 857014 from home:bnavigator:branches:devel:languages:python

- Update to 5.5.1
  * Run tempest-full for stable/train
  * Remove use_2to3 backward compat for Setuptools
  * More easy_install.ScriptWriter.get_header()
- Changes for 5.5.0
  * Remove bdist_wininst support
  * Increase integration test timeout
  * Add Release Notes to documentation
  * Cleanup old legacy devstack-gate jobs
  * Begin work to modernize pbr’s integration testing
  * Re-add ChangeLog
  * Update some url to use opendev.org
  * Support newer openstackdocstheme
  * Use easy_install.ScriptWriter.get_header()
  * Remove neutron-fwaas from the jobs’ required project
  * Update python requires packaging metadata for package
  * trivial: Improve logging of run commands
  + Map requires-python to python-requires
  * Update hacking
  * Add support for virtualenv 20.x
- Only test the primary python3 interpreter because some test
  dependencies from OpenStack (which are not hard required by the
  package itself) only provide that one.
  gh#openSUSE/python-rpm-macros#66
- Add remove_mock.patch 
 
 https://review.opendev.org/c/openstack/pbr/+/767972

OBS-URL: https://build.opensuse.org/request/show/857014
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=133

pbr-5.4.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07f558fece33b05caf857474a366dfcc00562bca13dd8b47b2b3e22d9f9bf55c
-size 120510

pbr-5.5.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fad80b613c402d5b7df7bd84812548b2a61e9977387a80a5fc5c396492b13c9
+size 117488

python-pbr.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Sat Dec 19 15:41:35 UTC 2020 - Benjamin Greiner <code@bnavigator.de>
+
+- Update to 5.5.1
+  * Run tempest-full for stable/train
+  * Remove use_2to3 backward compat for Setuptools
+  * More easy_install.ScriptWriter.get_header()
+- Changes for 5.5.0
+  * Remove bdist_wininst support
+  * Increase integration test timeout
+  * Add Release Notes to documentation
+  * Cleanup old legacy devstack-gate jobs
+  * Begin work to modernize pbr’s integration testing
+  * Re-add ChangeLog
+  * Update some url to use opendev.org
+  * Support newer openstackdocstheme
+  * Use easy_install.ScriptWriter.get_header()
+  * Remove neutron-fwaas from the jobs’ required project
+  * Update python requires packaging metadata for package
+  * trivial: Improve logging of run commands
+  + Map requires-python to python-requires
+  * Update hacking
+  * Add support for virtualenv 20.x
+- Only test the primary python3 interpreter because some test
+  dependencies from OpenStack (which are not hard required by the
+  package itself) only provide that one.
+  gh#openSUSE/python-rpm-macros#66
+- Add remove_mock.patch
+  https://review.opendev.org/c/openstack/pbr/+/767972
+
 -------------------------------------------------------------------
 Tue Jun  2 16:28:54 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

python-pbr.spec

@@ -26,41 +26,43 @@
 %bcond_with test
 %endif
 Name:           python-pbr%{psuffix}
-Version:        5.4.5
+Version:        5.5.1
 Release:        0
 Summary:        Python Build Reasonableness
 License:        Apache-2.0
 Group:          Development/Languages/Python
-URL:            http://pypi.python.org/pypi/pbr
+URL:            https://docs.openstack.org/pbr/latest/
 Source:         https://files.pythonhosted.org/packages/source/p/pbr/pbr-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM remove_mock.patch -- https://review.opendev.org/c/openstack/pbr/+/767972 remove explicit mock
+Patch0:         remove_mock.patch
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-setuptools
 Recommends:     git-core
-Recommends:     python-reno >= 2.5.0
 Suggests:       python-nose
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 Obsoletes:      python-pbr-doc
 BuildArch:      noarch
 %if %{with test}
-BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module fixtures >= 3.0.0}
-BuildRequires:  %{python_module mock >= 2.0}
-BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module pyparsing >= 2.0.2}
-BuildRequires:  %{python_module reno >= 2.5.0}
-BuildRequires:  %{python_module six >= 1.10.0}
-BuildRequires:  %{python_module stestr >= 2.1.0}
-BuildRequires:  %{python_module testrepository >= 0.0.18}
-BuildRequires:  %{python_module testresources >= 2.0.0}
-BuildRequires:  %{python_module testscenarios >= 0.4}
-BuildRequires:  %{python_module testtools >= 2.2.0}
-BuildRequires:  %{python_module virtualenv >= 14.0.6}
-BuildRequires:  %{python_module wheel >= 0.32.0}
 BuildRequires:  git-core
 BuildRequires:  gpg2
+# Package originates from OpenStack and depends on other OpenStack packages for testing.
+# These are only available for the primary python3 interpreter in TW, but optional.
+# --> Only test in default python3 flavor.  gh#openSUSE/python-rpm-macros#66
+# Python 2 packages on Leap are too outdated to test, either (stestr, subunit).
+BuildRequires:  python3-Sphinx
+BuildRequires:  python3-devel
+BuildRequires:  python3-fixtures >= 3.0.0
+BuildRequires:  python3-six >= 1.12.0
+BuildRequires:  python3-stestr >= 2.1.0
+BuildRequires:  python3-testrepository >= 0.0.18
+BuildRequires:  python3-testresources >= 2.0.0
+BuildRequires:  python3-testscenarios >= 0.4
+BuildRequires:  python3-testtools >= 2.2.0
+BuildRequires:  python3-virtualenv >= 20.0.3
+BuildRequires:  python3-wheel >= 0.32.0
 %endif
 %python_subpackages
 
@@ -72,7 +74,7 @@ files and generate AUTHORS and ChangeLog file all from git
 information.
 
 %prep
-%setup -q -n pbr-%{version}
+%autosetup -p1 -n pbr-%{version}
 
 sed -i '/coverage/d;/hacking/d' test-requirements.txt
 
@@ -82,8 +84,7 @@ sed -i '/coverage/d;/hacking/d' test-requirements.txt
 %if %{with test}
 %check
 export OS_TEST_TIMEOUT=60
-# test_requirement_parsing - syntax based on old virtualenv
+python3 -m stestr run --suppress-attachments
-%python_exec -m stestr run --black-regex 'test_requirement_parsing'
 %endif
 
 %if !%{with test}

remove_mock.patch

@@ -0,0 +1,45 @@
+Index: pbr-5.5.1/pbr/tests/test_packaging.py
+===================================================================
+--- pbr-5.5.1.orig/pbr/tests/test_packaging.py
++++ pbr-5.5.1/pbr/tests/test_packaging.py
+@@ -48,7 +48,10 @@ import tempfile
+ import textwrap
+ 
+ import fixtures
+-import mock
++try:
++    from unittest import mock
++except ImportError:
++    import mock
+ import pkg_resources
+ import six
+ import testscenarios
+Index: pbr-5.5.1/pbr/tests/test_pbr_json.py
+===================================================================
+--- pbr-5.5.1.orig/pbr/tests/test_pbr_json.py
++++ pbr-5.5.1/pbr/tests/test_pbr_json.py
+@@ -10,7 +10,10 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+ 
+-import mock
++try:
++    from unittest import mock
++except ImportError:
++    import mock
+ 
+ from pbr import pbr_json
+ from pbr.tests import base
+Index: pbr-5.5.1/test-requirements.txt
+===================================================================
+--- pbr-5.5.1.orig/test-requirements.txt
++++ pbr-5.5.1/test-requirements.txt
+@@ -5,7 +5,7 @@
+ wheel>=0.32.0 # MIT
+ fixtures>=3.0.0 # Apache-2.0/BSD
+ hacking>=1.1.0,<4.0.0 # Apache-2.0
+-mock>=2.0.0 # BSD
++mock>=2.0.0;python_version<='3.3' # BSD
+ six>=1.12.0 # MIT
+ stestr>=2.1.0,<3.0;python_version=='2.7' # Apache-2.0
+ stestr>=2.1.0;python_version>='3.0' # Apache-2.0