public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-pbr] rawhide: Update v7.1.1
@ 2026-09-09  7:19 Steve Traylen
  0 siblings, 0 replies; only message in thread
From: Steve Traylen @ 2026-09-09  7:19 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/python-pbr
            Branch : rawhide
            Commit : 9414fac572adc1bcdc8d4802385ba21184426829
            Author : Steve Traylen <steve.traylen@cern.ch>
            Date   : 2026-09-09T09:18:33+02:00
            Stats  : +2/-61 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-pbr/c/9414fac572adc1bcdc8d4802385ba21184426829?branch=rawhide

            Log:
            Update v7.1.1

- Resolves: rhbz:2515241

---
diff --git a/0001-functional-tests-extend-PYTHONPATH-rather-than-repla.patch b/0001-functional-tests-extend-PYTHONPATH-rather-than-repla.patch
deleted file mode 100644
index 0b1e6a6..0000000
--- a/0001-functional-tests-extend-PYTHONPATH-rather-than-repla.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 0821b12e8943a1bc80e9b0b176c4de62c8d5a60e Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Sun, 24 May 2026 19:08:12 +0200
-Subject: [PATCH] functional tests: extend PYTHONPATH rather than replace it
-
-The functional tests that run installed scripts as subprocesses were
-either setting PYTHONPATH to a fixed value ('.') or constructing a
-minimal env dict containing only PYTHONPATH. Both approaches discard
-any PYTHONPATH inherited from the parent process.
-
-This breaks in network-isolated build environments (e.g. Fedora mock
-buildroots) where the build system injects PYTHONPATH to make the
-just-built package importable. When the subprocess discards that,
-pbr itself is no longer findable and the installed scripts fail with:
-
-    ModuleNotFoundError: No module named 'pbr'
-
-Fix by appending any inherited PYTHONPATH to the subprocess value,
-keeping the test-specific paths at higher priority.
----
- pbr/tests/functional/test_console_scripts.py | 4 +++-
- pbr/tests/functional/test_wsgi_scripts.py    | 3 +++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pbr/tests/functional/test_console_scripts.py b/pbr/tests/functional/test_console_scripts.py
-index d33ea17..0c32992 100644
---- a/pbr/tests/functional/test_console_scripts.py
-+++ b/pbr/tests/functional/test_console_scripts.py
-@@ -86,7 +86,9 @@ class TestConsoleScripts(base.BaseTestCase):
-             'install_scripts', '--install-dir=%s' % self.temp_dir
-         )
- 
--        self.useFixture(fixtures.EnvironmentVariable('PYTHONPATH', '.'))
-+        existing = os.environ.get('PYTHONPATH')
-+        pythonpath = '.:' + existing if existing else '.'
-+        self.useFixture(fixtures.EnvironmentVariable('PYTHONPATH', pythonpath))
- 
-         self.check_script_install(stdout)
- 
-diff --git a/pbr/tests/functional/test_wsgi_scripts.py b/pbr/tests/functional/test_wsgi_scripts.py
-index 5a22ea9..05b5c79 100644
---- a/pbr/tests/functional/test_wsgi_scripts.py
-+++ b/pbr/tests/functional/test_wsgi_scripts.py
-@@ -103,6 +103,9 @@ class TestWsgiScripts(base.BaseTestCase):
-             popen_cmd.extend(extra_args)
- 
-         env = {'PYTHONPATH': self._get_path()}
-+        existing = os.environ.get('PYTHONPATH')
-+        if existing:
-+            env['PYTHONPATH'] = self._get_path() + ':' + existing
- 
-         p = subprocess.Popen(
-             popen_cmd,
--- 
-2.54.0
-

diff --git a/python-pbr.spec b/python-pbr.spec
index 3f58e4c..e1a39aa 100644
--- a/python-pbr.spec
+++ b/python-pbr.spec
@@ -5,16 +5,13 @@
 %bcond tests %[%{defined fedora} && %{without bootstrap}]
 
 Name:           python-%{pypi_name}
-Version:        7.0.3
+Version:        7.1.1
 Release:        %autorelease
 Summary:        Python Build Reasonableness
 
 License:        Apache-2.0
 URL:            https://docs.openstack.org/pbr/latest/
 Source:         %{pypi_source %{pypi_name}}
-# Extend rather than reset PYTHONPATH
-# https://review.opendev.org/c/openstack/pbr/+/989910
-Patch0:         0001-functional-tests-extend-PYTHONPATH-rather-than-repla.patch
 
 BuildArch:      noarch
 

diff --git a/sources b/sources
index 38ff135..561984e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pbr-7.0.3.tar.gz) = dff6c9ae44cdb8db111d87530a1096dd3f9045df20cb3105f736b909f9dce957e2e8f54d6a8a1c09139689d39b1b3b4dbd53947414e4d467b11314b7f397fb99
+SHA512 (pbr-7.1.1.tar.gz) = b6b9858b44e4fd6a9b28cc8378adf5943717a7bdde33dda7d389581b23a237454aa53b2401a5a473090208c1595109297879c3cd3cdfa87815db85313b968425

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-09  7:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-09  7:19 [rpms/python-pbr] rawhide: Update v7.1.1 Steve Traylen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox