Convert from Fedora for the Python 3.12 stack in RHEL
This commit is contained in:
parent
8069f5d43a
commit
89065a035e
30
4094.patch
30
4094.patch
@ -1,30 +0,0 @@
|
|||||||
From 29f052da470ac281f15d87d4a40511b5cd1e4834 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
|
||||||
Date: Thu, 26 Oct 2023 14:55:12 +0200
|
|
||||||
Subject: [PATCH] Fix setuptools.depends:get_module_constant() on Python
|
|
||||||
3.13.0a1
|
|
||||||
|
|
||||||
Don't hardcode opcode numbers, look them up instead.
|
|
||||||
|
|
||||||
Fixes https://github.com/pypa/setuptools/issues/4090
|
|
||||||
---
|
|
||||||
setuptools/depends.py | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/setuptools/depends.py b/setuptools/depends.py
|
|
||||||
index 180e820459..42907d9bd4 100644
|
|
||||||
--- a/setuptools/depends.py
|
|
||||||
+++ b/setuptools/depends.py
|
|
||||||
@@ -142,9 +142,9 @@ def extract_constant(code, symbol, default=-1):
|
|
||||||
|
|
||||||
name_idx = list(code.co_names).index(symbol)
|
|
||||||
|
|
||||||
- STORE_NAME = 90
|
|
||||||
- STORE_GLOBAL = 97
|
|
||||||
- LOAD_CONST = 100
|
|
||||||
+ STORE_NAME = dis.opmap['STORE_NAME']
|
|
||||||
+ STORE_GLOBAL = dis.opmap['STORE_GLOBAL']
|
|
||||||
+ LOAD_CONST = dis.opmap['LOAD_CONST']
|
|
||||||
|
|
||||||
const = default
|
|
||||||
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
From 850efbc4dfe5b8c64dd21617bc856ba0d4e3a082 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lumir Balhar <lbalhar@redhat.com>
|
|
||||||
Date: Wed, 20 Sep 2023 19:47:05 +0200
|
|
||||||
Subject: [PATCH] Remove optional or unpackaged test deps
|
|
||||||
|
|
||||||
---
|
|
||||||
setup.cfg | 14 --------------
|
|
||||||
1 file changed, 14 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/setup.cfg b/setup.cfg
|
|
||||||
index c7aaf14..33b9cd7 100644
|
|
||||||
--- a/setup.cfg
|
|
||||||
+++ b/setup.cfg
|
|
||||||
@@ -42,17 +42,7 @@ exclude =
|
|
||||||
[options.extras_require]
|
|
||||||
testing =
|
|
||||||
pytest >= 6
|
|
||||||
- pytest-checkdocs >= 2.4
|
|
||||||
- pytest-black >= 0.3.7; \
|
|
||||||
- python_implementation != "PyPy"
|
|
||||||
- pytest-cov; \
|
|
||||||
- python_implementation != "PyPy"
|
|
||||||
- pytest-mypy >= 0.9.1; \
|
|
||||||
- python_implementation != "PyPy"
|
|
||||||
- pytest-enabler >= 2.2
|
|
||||||
- pytest-ruff; sys_platform != "cygwin"
|
|
||||||
|
|
||||||
- flake8-2020
|
|
||||||
virtualenv>=13.0.0
|
|
||||||
wheel
|
|
||||||
pip>=19.1 # For proper file:// URLs support.
|
|
||||||
@@ -60,13 +50,9 @@ testing =
|
|
||||||
pytest-xdist
|
|
||||||
jaraco.path>=3.2.0
|
|
||||||
build[virtualenv]
|
|
||||||
- filelock>=3.4.0
|
|
||||||
ini2toml[lite]>=0.9
|
|
||||||
tomli-w>=1.0.0
|
|
||||||
pytest-timeout
|
|
||||||
- pytest-perf; \
|
|
||||||
- sys_platform != "cygwin"
|
|
||||||
- jaraco.develop >= 7.21; python_version >= "3.9" and sys_platform != "cygwin"
|
|
||||||
testing-integration =
|
|
||||||
pytest
|
|
||||||
pytest-xdist
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
From 95546a2302152676192d5a4880b1e5d09d2f854f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Lumir Balhar <lbalhar@redhat.com>
|
|
||||||
Date: Fri, 22 Sep 2023 00:11:50 +0200
|
|
||||||
Subject: [PATCH] Remove warning from pkg_resources
|
|
||||||
|
|
||||||
---
|
|
||||||
pkg_resources/__init__.py | 7 +------
|
|
||||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/pkg_resources/__init__.py b/pkg_resources/__init__.py
|
|
||||||
index 3baa1f3..31f81a4 100644
|
|
||||||
--- a/pkg_resources/__init__.py
|
|
||||||
+++ b/pkg_resources/__init__.py
|
|
||||||
@@ -115,12 +115,7 @@ _namespace_handlers = None
|
|
||||||
_namespace_packages = None
|
|
||||||
|
|
||||||
|
|
||||||
-warnings.warn(
|
|
||||||
- "pkg_resources is deprecated as an API. "
|
|
||||||
- "See https://setuptools.pypa.io/en/latest/pkg_resources.html",
|
|
||||||
- DeprecationWarning,
|
|
||||||
- stacklevel=2,
|
|
||||||
-)
|
|
||||||
+
|
|
||||||
|
|
||||||
|
|
||||||
_PEP440_FALLBACK = re.compile(r"^v?(?P<safe>(?:[0-9]+!)?[0-9]+(?:\.[0-9]+)*)", re.I)
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user