From d785cbe22906c54839deeba1cfce84f8235a707134b8d1d10b893ff599bdac78 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 18 May 2021 21:13:38 +0000 Subject: [PATCH] - update to 5.6.0: * Reverse ordering of 'D1\_D2\_SETUP\_ARGS' * Add test for cfg -> py transformation * Don't pass empty 'long\_description' * Move flake8 as a pre-commit local target * Map requires-python to python-requires (attempt 2) * Update dependencies to avoid failure with old pip * Increase OS\_TEST\_TIMEOUT to 1200 * Prevent test failure due to use of setpref * util: Convert 'D1\_D2\_SETUP\_ARGS' to a list of tuples * Revert "Map requires-python to python-requires" * Dropping lower constraints testing * Adding pre-commit OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=135 --- pbr-5.5.1.tar.gz | 3 --- pbr-5.6.0.tar.gz | 3 +++ python-pbr.changes | 17 +++++++++++++++++ python-pbr.spec | 8 ++++---- remove_mock.patch | 46 ++++++++++++++++++++++++++++------------------ 5 files changed, 52 insertions(+), 25 deletions(-) delete mode 100644 pbr-5.5.1.tar.gz create mode 100644 pbr-5.6.0.tar.gz diff --git a/pbr-5.5.1.tar.gz b/pbr-5.5.1.tar.gz deleted file mode 100644 index 02c01aa..0000000 --- a/pbr-5.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fad80b613c402d5b7df7bd84812548b2a61e9977387a80a5fc5c396492b13c9 -size 117488 diff --git a/pbr-5.6.0.tar.gz b/pbr-5.6.0.tar.gz new file mode 100644 index 0000000..53523b5 --- /dev/null +++ b/pbr-5.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42df03e7797b796625b1029c0400279c7c34fd7df24a7d7818a1abb5b38710dd +size 125220 diff --git a/python-pbr.changes b/python-pbr.changes index f4abc5c..c70dce7 100644 --- a/python-pbr.changes +++ b/python-pbr.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue May 18 21:10:52 UTC 2021 - Dirk Müller + +- update to 5.6.0: + * Reverse ordering of 'D1\_D2\_SETUP\_ARGS' + * Add test for cfg -> py transformation + * Don't pass empty 'long\_description' + * Move flake8 as a pre-commit local target + * Map requires-python to python-requires (attempt 2) + * Update dependencies to avoid failure with old pip + * Increase OS\_TEST\_TIMEOUT to 1200 + * Prevent test failure due to use of setpref + * util: Convert 'D1\_D2\_SETUP\_ARGS' to a list of tuples + * Revert "Map requires-python to python-requires" + * Dropping lower constraints testing + * Adding pre-commit + ------------------------------------------------------------------- Sat Dec 19 15:41:35 UTC 2020 - Benjamin Greiner diff --git a/python-pbr.spec b/python-pbr.spec index 023b53e..670866e 100644 --- a/python-pbr.spec +++ b/python-pbr.spec @@ -1,7 +1,7 @@ # -# spec file for package python-pbr +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 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.5.1 +Version: 5.6.0 Release: 0 Summary: Python Build Reasonableness License: Apache-2.0 @@ -42,7 +42,7 @@ Requires: python-setuptools Recommends: git-core Suggests: python-nose Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Obsoletes: python-pbr-doc BuildArch: noarch %if %{with test} diff --git a/remove_mock.patch b/remove_mock.patch index c741ef9..a2b77bf 100644 --- a/remove_mock.patch +++ b/remove_mock.patch @@ -1,8 +1,19 @@ -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 +From 8c4eafa33100f68bccc30575ac3113532e247f23 Mon Sep 17 00:00:00 2001 +From: Ben Greiner +Date: Sat, 19 Dec 2020 17:07:07 +0100 +Subject: [PATCH] remove explicit mock + +The explicit mock package is not required if you can use unittest.mock +from python >= 3.3 + +Change-Id: I1e3a764b38be66b994d790768bc5eb9be4237444 +--- + +diff --git a/pbr/tests/test_packaging.py b/pbr/tests/test_packaging.py +index 9e95a86..ec51146 100644 +--- a/pbr/tests/test_packaging.py ++++ b/pbr/tests/test_packaging.py +@@ -48,7 +48,10 @@ import textwrap import fixtures @@ -14,10 +25,10 @@ Index: pbr-5.5.1/pbr/tests/test_packaging.py 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 +diff --git a/pbr/tests/test_pbr_json.py b/pbr/tests/test_pbr_json.py +index f066971..eb9a08a 100644 +--- a/pbr/tests/test_pbr_json.py ++++ b/pbr/tests/test_pbr_json.py @@ -10,7 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. @@ -30,16 +41,15 @@ Index: pbr-5.5.1/pbr/tests/test_pbr_json.py 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 +diff --git a/test-requirements.txt b/test-requirements.txt +index 4d586e4..3af261d 100644 +--- a/test-requirements.txt ++++ b/test-requirements.txt +@@ -6,7 +6,6 @@ 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 + hacking>=1.1.0,<4.0.0;python_version>='3.6' # Apache-2.0 + mock>=2.0.0,<4.0.0;python_version=='2.7' # BSD +-mock>=2.0.0;python_version>='3.6' # 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