Now that we're on python 3.12 we can drop these numpy patches that were
needed for tests on python 3.11.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/py-numpy/Makefile,v
diff -u -p -u -r1.83 Makefile
--- Makefile 21 Dec 2024 11:38:24 -0000 1.83
+++ Makefile 28 Dec 2024 16:01:25 -0000
@@ -3,7 +3,7 @@ COMMENT= fast array and numeric program
MODPY_DISTV= 1.26.4
DISTNAME= numpy-${MODPY_DISTV}
PKGNAME= py-${DISTNAME}
-REVISION= 2
+REVISION= 3
CATEGORIES= math devel
Index: patches/patch-numpy__pytesttester_py
===================================================================
RCS file: patches/patch-numpy__pytesttester_py
diff -N patches/patch-numpy__pytesttester_py
--- patches/patch-numpy__pytesttester_py 29 Aug 2024 08:11:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-1.26.4 has removed numpy.distutils but tests still reference it
-
-Index: numpy/_pytesttester.py
---- numpy/_pytesttester.py.orig
-+++ numpy/_pytesttester.py
-@@ -135,7 +135,7 @@ class PytestTester:
- # offset verbosity. The "-q" cancels a "-v".
- pytest_args += ["-q"]
-
-- if sys.version_info < (3, 12):
-+ if sys.version_info < (3, 11):
- with warnings.catch_warnings():
- warnings.simplefilter("always")
- # Filter out distutils cpu warnings (could be localized to
Index: patches/patch-numpy_tests_test_public_api_py
===================================================================
RCS file: patches/patch-numpy_tests_test_public_api_py
diff -N patches/patch-numpy_tests_test_public_api_py
--- patches/patch-numpy_tests_test_public_api_py 29 Aug 2024 08:11:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-1.26.4 has removed numpy.distutils but tests still reference it
-
-Index: numpy/tests/test_public_api.py
---- numpy/tests/test_public_api.py.orig
-+++ numpy/tests/test_public_api.py
-@@ -159,7 +159,7 @@ PUBLIC_MODULES = ['numpy.' + s for s in [
- "typing.mypy_plugin",
- "version" # Should be removed for NumPy 2.0
- ]]
--if sys.version_info < (3, 12):
-+if sys.version_info < (3, 11):
- PUBLIC_MODULES += [
- 'numpy.' + s for s in [
- "distutils",
-@@ -240,7 +240,7 @@ PRIVATE_BUT_PRESENT_MODULES = ['numpy.' + s for s in [
- "random.bit_generator",
- "testing.print_coercion_tables",
- ]]
--if sys.version_info < (3, 12):
-+if sys.version_info < (3, 11):
- PRIVATE_BUT_PRESENT_MODULES += [
- 'numpy.' + s for s in [
- "distutils.armccompiler",
-@@ -335,7 +335,7 @@ SKIP_LIST = [
- "numpy.core.generate_numpy_api",
- "numpy.core.umath_tests",
- ]
--if sys.version_info < (3, 12):
-+if sys.version_info < (3, 11):
- SKIP_LIST += ["numpy.distutils.msvc9compiler"]
-
-
-@@ -380,7 +380,7 @@ SKIP_LIST_2 = [
- 'numpy.matlib.ctypeslib',
- 'numpy.matlib.ma',
- ]
--if sys.version_info < (3, 12):
-+if sys.version_info < (3, 11):
- SKIP_LIST_2 += [
- 'numpy.distutils.log.sys',
- 'numpy.distutils.log.logging',
Index: patches/patch-numpy_typing_tests_test_isfile_py
===================================================================
RCS file: patches/patch-numpy_typing_tests_test_isfile_py
diff -N patches/patch-numpy_typing_tests_test_isfile_py
--- patches/patch-numpy_typing_tests_test_isfile_py 29 Aug 2024 08:11:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-1.26.4 has removed numpy.distutils but tests still reference it
-
-Index: numpy/typing/tests/test_isfile.py
---- numpy/typing/tests/test_isfile.py.orig
-+++ numpy/typing/tests/test_isfile.py
-@@ -21,7 +21,7 @@ FILES = [
- ROOT / "random" / "__init__.pyi",
- ROOT / "testing" / "__init__.pyi",
- ]
--if sys.version_info < (3, 12):
-+if sys.version_info < (3, 11):
- FILES += [ROOT / "distutils" / "__init__.pyi"]
-
-
No comments:
Post a Comment