Update to 26.0.1
- Fixes: rhbz#2435623
This commit is contained in:
parent
80bc682b8f
commit
e2328ff347
3 changed files with 21 additions and 25 deletions
|
|
@ -1,6 +1,6 @@
|
|||
From 35378ae02912d704d466e4809070e17a8d13ad0a Mon Sep 17 00:00:00 2001
|
||||
From 9710f03327c685194b7a63c2271a84697425cb47 Mon Sep 17 00:00:00 2001
|
||||
From: Karolina Surma <ksurma@redhat.com>
|
||||
Date: Thu, 7 Aug 2025 15:05:34 +0200
|
||||
Date: Tue, 10 Feb 2026 15:19:10 +0100
|
||||
Subject: [PATCH] Downstream-Only: Remove pytest-subket from tests
|
||||
|
||||
---
|
||||
|
|
@ -8,10 +8,10 @@ Subject: [PATCH] Downstream-Only: Remove pytest-subket from tests
|
|||
1 file changed, 17 deletions(-)
|
||||
|
||||
diff --git a/tests/conftest.py b/tests/conftest.py
|
||||
index c98b871..ada7a7e 100644
|
||||
index 1b65e9d..8e1b595 100644
|
||||
--- a/tests/conftest.py
|
||||
+++ b/tests/conftest.py
|
||||
@@ -451,18 +451,6 @@ def coverage_install(
|
||||
@@ -447,18 +447,6 @@ def coverage_install(
|
||||
return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage")
|
||||
|
||||
|
||||
|
|
@ -30,18 +30,18 @@ index c98b871..ada7a7e 100644
|
|||
def install_pth_link(
|
||||
venv: VirtualEnvironment, project_name: str, lib_dir: Path
|
||||
) -> None:
|
||||
@@ -480,7 +468,6 @@ def virtualenv_template(
|
||||
@@ -475,7 +463,6 @@ def virtualenv_template(
|
||||
pip_editable_parts: tuple[Path, ...],
|
||||
setuptools_install: Path,
|
||||
wheel_install: Path,
|
||||
coverage_install: Path,
|
||||
- socket_install: Path,
|
||||
) -> VirtualEnvironment:
|
||||
venv_type: VirtualEnvironmentType
|
||||
if request.config.getoption("--use-venv"):
|
||||
@@ -495,10 +482,6 @@ def virtualenv_template(
|
||||
# Install setuptools, wheel, pytest-subket, and pip.
|
||||
@@ -489,10 +476,6 @@ def virtualenv_template(
|
||||
|
||||
# Install setuptools, pytest-subket, and pip.
|
||||
install_pth_link(venv, "setuptools", setuptools_install)
|
||||
install_pth_link(venv, "wheel", wheel_install)
|
||||
- install_pth_link(venv, "pytest_subket", socket_install)
|
||||
- # Also copy pytest-subket's .pth file so it can intercept socket calls.
|
||||
- with open(venv.site / "pytest_socket.pth", "w") as f:
|
||||
|
|
@ -50,5 +50,5 @@ index c98b871..ada7a7e 100644
|
|||
pth, dist_info = pip_editable_parts
|
||||
|
||||
--
|
||||
2.50.1
|
||||
2.52.0
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
%bcond man 1
|
||||
|
||||
%global srcname pip
|
||||
%global base_version 25.3
|
||||
%global base_version 26.0.1
|
||||
%global upstream_version %{base_version}%{?prerel}
|
||||
%global python_wheel_name %{srcname}-%{upstream_version}-py3-none-any.whl
|
||||
|
||||
|
|
@ -51,12 +51,6 @@ Source0: https://github.com/pypa/pip/archive/%{upstream_version}/%{srcnam
|
|||
# See https://github.com/pypa/pip/pull/13357 for rationale.
|
||||
Source1: https://files.pythonhosted.org/packages/0d/6d/b4752b044bf94cb802d88a888dc7d288baaf77d7910b7dedda74b5ceea0c/setuptools-79.0.1-py3-none-any.whl
|
||||
|
||||
# wheel.whl
|
||||
# We cannot use RPM-packaged python-wheel-wheel because we intent to drop that package in wheel 0.46+.
|
||||
# That version of wheel has runtime dependencies and is generally useless as a standalone wheel.
|
||||
# See https://github.com/pypa/pip/pull/13382 as an attempt to drop the requirement from pip tests.
|
||||
Source2: https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl
|
||||
|
||||
# flit_core.whl
|
||||
# This is not built as RPM-packaged wheel in Fedora at all.
|
||||
Source3: https://files.pythonhosted.org/packages/f2/65/b6ba90634c984a4fcc02c7e3afe523fef500c4980fec67cc27536ee50acf/flit_core-3.12.0-py3-none-any.whl
|
||||
|
|
@ -123,15 +117,15 @@ Packages" or "Pip Installs Python".
|
|||
# You can generate it with:
|
||||
# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{1}dist' src/pip/_vendor/vendor.txt
|
||||
%global bundled() %{expand:
|
||||
Provides: bundled(python%{1}dist(cachecontrol)) = 0.14.3
|
||||
Provides: bundled(python%{1}dist(certifi)) = 2025.10.5
|
||||
Provides: bundled(python%{1}dist(cachecontrol)) = 0.14.4
|
||||
Provides: bundled(python%{1}dist(certifi)) = 2026.1.4
|
||||
Provides: bundled(python%{1}dist(dependency-groups)) = 1.3.1
|
||||
Provides: bundled(python%{1}dist(distlib)) = 0.4
|
||||
Provides: bundled(python%{1}dist(distro)) = 1.9
|
||||
Provides: bundled(python%{1}dist(idna)) = 3.10
|
||||
Provides: bundled(python%{1}dist(idna)) = 3.11
|
||||
Provides: bundled(python%{1}dist(msgpack)) = 1.1.2
|
||||
Provides: bundled(python%{1}dist(packaging)) = 25
|
||||
Provides: bundled(python%{1}dist(platformdirs)) = 4.5
|
||||
Provides: bundled(python%{1}dist(packaging)) = 26
|
||||
Provides: bundled(python%{1}dist(platformdirs)) = 4.5.1
|
||||
Provides: bundled(python%{1}dist(pygments)) = 2.19.2
|
||||
Provides: bundled(python%{1}dist(pyproject-hooks)) = 1.2
|
||||
Provides: bundled(python%{1}dist(requests)) = 2.32.5
|
||||
|
|
@ -226,10 +220,13 @@ sed -Ei '/(pytest-(cov|xdist|rerunfailures|subket)|proxy\.py)/d' pyproject.toml
|
|||
# Remove unused pytest-subket options
|
||||
sed -Ei '/(--disable-socket|--allow-unix-socket|--allow-hosts=localhost)/d' pyproject.toml
|
||||
|
||||
# Disable --cov option since we don't use it in Fedora
|
||||
sed -i 's/"--cov"/"--cov", default=None/' tests/conftest.py
|
||||
|
||||
%if %{with tests}
|
||||
# tests expect wheels in here
|
||||
mkdir tests/data/common_wheels
|
||||
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} tests/data/common_wheels
|
||||
cp -a %{SOURCE1} %{SOURCE3} %{SOURCE4} tests/data/common_wheels
|
||||
%endif
|
||||
|
||||
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1,5 +1,4 @@
|
|||
SHA512 (pip-25.3.tar.gz) = f50db092213ec3bb819d3da5669f73d119b5ec7f7ac5e8a587a17c27eafa32bc17a057df09389c526a3769ef3577f5553187d54ceffa89aed63f4b4498ff044e
|
||||
SHA512 (pip-26.0.1.tar.gz) = 3786df7522ea65bc20fb9885ce5c2ddc60200a536a1f754a8d7dc278115c73258863e4c51ac7e9a60dda0b70263730dc194f70e1e8f8d00178a8b3c724333bf0
|
||||
SHA512 (setuptools-79.0.1-py3-none-any.whl) = fef6cfc6f95a5bb7320f1680e1c665cb8d9a4e4227cde4d8aab8a50bed4bcf04320085b9d7d5343359f887008db5c5a861e57f3d08b7b0b2311a28adaeee6b4a
|
||||
SHA512 (wheel-0.45.1-py3-none-any.whl) = 86c16248ec804ee0ac95d43b03d47351dceb534d0cdc4025ca1eb073e39e539de44c870b9261f0373144e1537f0e42675a759a318a8d5d346bbd9efcb704061d
|
||||
SHA512 (flit_core-3.12.0-py3-none-any.whl) = 790c12b1f43201e365fb3f8f2f0a54e1a578876799dfdf8bfeea679a25ea096bf62946d006618c1458ae6e37ce6d00998f37e9aba426d5ab80d32ef2d75da4e0
|
||||
SHA512 (coverage-0-py3-none-any.whl) = e734192565347010efe68f8ba600254259c9b647f3c553fd4e5d87b1d7f955cb15d6f7d807716f4a6415d239beed945fbec7210feaf502e9cc849c332845926e
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue