Update to 7.3.2. Fixes rhbz#2213992.
This commit is contained in:
parent
5f66224fc6
commit
44284159b0
48
10938.patch
48
10938.patch
@ -1,48 +0,0 @@
|
|||||||
From 5418df4ca00194b5a18aa313c562879aeb3c53c4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
||||||
Date: Mon, 24 Apr 2023 09:55:50 +0200
|
|
||||||
Subject: [PATCH] Filter new pkg_resources deprecations
|
|
||||||
|
|
||||||
Fixes https://github.com/pytest-dev/pytest/issues/10815
|
|
||||||
---
|
|
||||||
testing/acceptance_test.py | 8 ++++++--
|
|
||||||
testing/test_monkeypatch.py | 4 +---
|
|
||||||
2 files changed, 7 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
|
|
||||||
index 4dac2cee33..680afe1339 100644
|
|
||||||
--- a/testing/acceptance_test.py
|
|
||||||
+++ b/testing/acceptance_test.py
|
|
||||||
@@ -695,11 +695,15 @@ def test_cmdline_python_namespace_package(
|
|
||||||
monkeypatch.chdir("world")
|
|
||||||
|
|
||||||
# pgk_resources.declare_namespace has been deprecated in favor of implicit namespace packages.
|
|
||||||
+ # pgk_resources has been deprecated entirely.
|
|
||||||
# While we could change the test to use implicit namespace packages, seems better
|
|
||||||
# to still ensure the old declaration via declare_namespace still works.
|
|
||||||
- ignore_w = r"-Wignore:Deprecated call to `pkg_resources.declare_namespace"
|
|
||||||
+ ignore_w = (
|
|
||||||
+ r"-Wignore:Deprecated call to `pkg_resources.declare_namespace",
|
|
||||||
+ r"-Wignore:pkg_resources is deprecated",
|
|
||||||
+ )
|
|
||||||
result = pytester.runpytest(
|
|
||||||
- "--pyargs", "-v", "ns_pkg.hello", "ns_pkg/world", ignore_w
|
|
||||||
+ "--pyargs", "-v", "ns_pkg.hello", "ns_pkg/world", *ignore_w
|
|
||||||
)
|
|
||||||
assert result.ret == 0
|
|
||||||
result.stdout.fnmatch_lines(
|
|
||||||
diff --git a/testing/test_monkeypatch.py b/testing/test_monkeypatch.py
|
|
||||||
index 3d09ef4263..500e244531 100644
|
|
||||||
--- a/testing/test_monkeypatch.py
|
|
||||||
+++ b/testing/test_monkeypatch.py
|
|
||||||
@@ -425,9 +425,7 @@ class A:
|
|
||||||
assert A.x == 1
|
|
||||||
|
|
||||||
|
|
||||||
-@pytest.mark.filterwarnings(
|
|
||||||
- "ignore:Deprecated call to `pkg_resources.declare_namespace"
|
|
||||||
-)
|
|
||||||
+@pytest.mark.filterwarnings(r"ignore:.*\bpkg_resources\b:DeprecationWarning")
|
|
||||||
def test_syspath_prepend_with_namespace_packages(
|
|
||||||
pytester: Pytester, monkeypatch: MonkeyPatch
|
|
||||||
) -> None:
|
|
@ -1,16 +1,14 @@
|
|||||||
Name: pytest
|
Name: pytest
|
||||||
%global base_version 7.3.1
|
%global base_version 7.3.2
|
||||||
#global prerelease ...
|
#global prerelease ...
|
||||||
Version: %{base_version}%{?prerelease:~%{prerelease}}
|
Version: %{base_version}%{?prerelease:~%{prerelease}}
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Simple powerful testing with Python
|
Summary: Simple powerful testing with Python
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://pytest.org
|
URL: https://pytest.org
|
||||||
Source: %{pypi_source pytest %{base_version}%{?prerelease}}
|
Source: %{pypi_source pytest %{base_version}%{?prerelease}}
|
||||||
# see https://github.com/pytest-dev/pytest/issues/10042#issuecomment-1237132867
|
# see https://github.com/pytest-dev/pytest/issues/10042#issuecomment-1237132867
|
||||||
Patch: pytest-7.1.3-fix-xfails.patch
|
Patch: pytest-7.1.3-fix-xfails.patch
|
||||||
# Filter new pkg_resources deprecations, merged upstream
|
|
||||||
Patch: https://github.com/pytest-dev/pytest/pull/10938.patch
|
|
||||||
|
|
||||||
# Remove -s from Python shebang,
|
# Remove -s from Python shebang,
|
||||||
# ensure that packages installed with pip to user locations are testable
|
# ensure that packages installed with pip to user locations are testable
|
||||||
@ -182,6 +180,9 @@ find %{buildroot}%{python3_sitelib} \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 12 2023 Maxwell G <maxwell@gtmx.me> - 7.3.2-1
|
||||||
|
- Update to 7.3.2. Fixes rhbz#2213992.
|
||||||
|
|
||||||
* Mon Apr 24 2023 Miro Hrončok <mhroncok@redhat.com> - 7.3.1-2
|
* Mon Apr 24 2023 Miro Hrončok <mhroncok@redhat.com> - 7.3.1-2
|
||||||
- Fix build with setuptools >= 67.5.0
|
- Fix build with setuptools >= 67.5.0
|
||||||
- Fixes: rhbz#2188982
|
- Fixes: rhbz#2188982
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (pytest-7.3.1.tar.gz) = e6c8fcf1449f5e09e33c01ec2ade8812ceb13440324179288b8ca0eeaaffed1e581a65c8acf4c28efe61c19a067e7ceddccc45d8a1582c89259d53fee25ab253
|
SHA512 (pytest-7.3.2.tar.gz) = 910de83f6ce47e7b1b25947050cf79e055ab04fd0c3dc3276546415684c20c8977883f16dfb913de3f339bc6284330f8a57d202c73f92b92545e45acb353b264
|
||||||
|
Loading…
Reference in New Issue
Block a user