diff --git a/0001-Skip-test-for-testr-hook-being-installed-when-testr-.patch b/0001-Skip-test-for-testr-hook-being-installed-when-testr-.patch deleted file mode 100644 index 0f02b77..0000000 --- a/0001-Skip-test-for-testr-hook-being-installed-when-testr-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a4f27ca3972f88e1f494a95ac74fb0c582dd59dd Mon Sep 17 00:00:00 2001 -From: Dirk Mueller -Date: Fri, 14 Sep 2018 23:14:47 +0200 -Subject: [PATCH] Skip test for testr hook being installed when testr is not - available - -pbr only depends on testrepository in the test requirements, so -packaging efforts can decide to skip the dependency if they want to. -As stestr is going to replace testrepository going forward, it makes -sense to make dependencies to testrepository optional. - -Skip the test that requires testrepository in that scenario. - -Change-Id: I28c30411a5a6fdb071ebcc35e65ce1f4f1242498 ---- - pbr/tests/test_hooks.py | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/pbr/tests/test_hooks.py b/pbr/tests/test_hooks.py -index 0fcf96c..3f74790 100644 ---- a/pbr/tests/test_hooks.py -+++ b/pbr/tests/test_hooks.py -@@ -41,7 +41,9 @@ - import os - - from testtools import matchers -+from testtools import skipUnless - -+from pbr import testr_command - from pbr.tests import base - from pbr.tests import util - -@@ -66,6 +68,7 @@ class TestHooks(base.BaseTestCase): - assert 'test_hook_1\ntest_hook_2' in stdout - assert return_code == 0 - -+ @skipUnless(testr_command.have_testr, "testrepository not available") - def test_custom_commands_known(self): - stdout, _, return_code = self.run_setup('--help-commands') - self.assertFalse(return_code) --- -2.18.0 - diff --git a/new_wheel.patch b/new_wheel.patch deleted file mode 100644 index 8fe0ef6..0000000 --- a/new_wheel.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- 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): diff --git a/pbr-4.3.0.tar.gz b/pbr-4.3.0.tar.gz deleted file mode 100644 index 705526a..0000000 --- a/pbr-4.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1be135151a0da949af8c5d0ee9013d9eafada71237eb80b3ba8896b4f12ec5dc -size 112935 diff --git a/pbr-5.1.3.tar.gz b/pbr-5.1.3.tar.gz new file mode 100644 index 0000000..df13a68 --- /dev/null +++ b/pbr-5.1.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c361cc353d988e4f5b998555c88098b9d5964c2e11acf7b0d21925a66bb5824 +size 115241 diff --git a/python-pbr.changes b/python-pbr.changes index 330aa24..6a0d47e 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 1 14:36:24 UTC 2019 - Ondřej Súkup + +- update to 5.1.3 +- drop 0001-Skip-test-for-testr-hook-being-installed-when-testr-.patch + new_wheel.patch + * Resolve ``ValueError`` when mapping value contains a literal ``=`` + * ignore –find-links in requirements file + * Do not globally replace path prefix + * Use templates for cover and lower-constraints + * Special case long_description_content_type + * Support wheel 0.32.0+ + ------------------------------------------------------------------- Thu Jan 17 15:56:29 UTC 2019 - Dominique Leuenberger diff --git a/python-pbr.spec b/python-pbr.spec index 1c28386..ca328b6 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -26,15 +26,13 @@ %bcond_with test %endif Name: python-pbr%{psuffix} -Version: 4.3.0 +Version: 5.1.3 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 Group: Development/Languages/Python 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