oldest-supported-numpy is deprecated; Numpy no longer supports python…

… 3.9
moble · Sep 30, 2024 · 9e508cd · 9e508cd
1 parent fe84374
commit 9e508cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -73,10 +73,10 @@ jobs:
             archs: "aarch64"
 
     env:
-      CIBW_SKIP: cp27-* cp35-* cp36-* cp37-* cp38-* pp* *-musllinux_aarch64 cp312-*_i686
+      CIBW_SKIP: cp36-* cp37-* cp38-* cp39-* pp* *-musllinux_aarch64 cp312-*_i686
       CIBW_ARCHS: ${{matrix.archs}}
       CIBW_ARCHS_MACOS: "x86_64 universal2 arm64"
-      CIBW_BEFORE_BUILD: python -c "print(('#'*130+'\n')*10)" && python -m pip install oldest-supported-numpy
+      CIBW_BEFORE_BUILD: python -c "print(('#'*130+'\n')*10)" && python -m pip install "numpy>=2.0,<3"
       CIBW_TEST_REQUIRES: pytest pytest-cov
       CIBW_TEST_COMMAND: "pytest {project}/tests"
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -2,7 +2,7 @@
 name = "quaternion"
 description = "Add a quaternion dtype to NumPy"
 readme = "README.md"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 license = {file = "LICENSE"}
 authors = [
   { name = "Michael Boyle", email = "michael.oliver.boyle@gmail.com" }
@@ -17,10 +17,9 @@ classifiers = [
   "Topic :: Scientific/Engineering :: Astronomy"
 ]
 dependencies = [
-  "numpy",
-  "scipy >=1.5",
-  "numba >=0.55; implementation_name == 'cpython'",
-  "importlib-metadata; python_version<'3.10'"
+  "numpy >=1.25,<3",
+  "scipy >=1.5<2",
+  "numba >=0.55; implementation_name == 'cpython'"
 ]
 dynamic = ["version"]
 
@@ -29,7 +28,7 @@ Homepage = "https://github.com/moble/quaternion"
 Documentation = "https://quaternionic.readthedocs.io/en/latest"
 
 [build-system]
-requires = ["setuptools>=61", "wheel", "oldest-supported-numpy"]
+requires = ["setuptools>=61", "wheel", "numpy>=2.0,<3"]
 build-backend = "setuptools.build_meta"
 
 [tool.hatch.envs.default]

diff --git a/setup.py b/setup.py
@@ -52,31 +52,6 @@
     long_description=long_description,
     long_description_content_type="text/markdown",
     ext_modules=extensions,
-    # install_requires=[
-    #     "numpy>=1.13",
-    #     # See also extras and :environment_marker specs below
-    # ],
-    # extras_require={
-    #     "scipy": [
-    #         "scipy",
-    #     ],
-    #     "numba:python_version < '3.6' and platform_python_implementation != 'PyPy'": [
-    #         "numba<0.49.0",
-    #         "llvmlite<0.32.0",
-    #     ],
-    #     "numba:python_version >= '3.6' and platform_python_implementation != 'PyPy'": [
-    #         "numba",
-    #     ],
-    #     "docs":  [
-    #         "mkdocs",
-    #         "mktheapidocs[plugin]",
-    #         "pymdown-extensions",
-    #     ],
-    #     "testing": [
-    #         "pytest",
-    #         "pytest-cov",
-    #     ]
-    # },
     version=version,
 )