Merge pull request #7 from zhisong/numpy2_fix

update to numpy2.0
zhisong · Jul 4, 2024 · 33416d9 · 33416d9
2 parents cd67eba + edb4e93
commit 33416d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,8 @@
 [build-system]
-requires = ["setuptools", "wheel", "oldest_supported_numpy"]
+requires = ["setuptools",
+            "wheel", 
+            "numpy>=2.0.0; python_version > '3.8'",
+            "oldest-supported-numpy; python_version <= '3.8'"]
 build-backend = "setuptools.build_meta"
 
 
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@
 
 setup(
     name="pyoculus",
-    version='0.3.1',
+    version='0.3.2',
     description="A Python version of Oculus - The eye into the chaos: a comprehensive magnetic field diagnostic package for non-integrable, toroidal magnetic fields",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -50,11 +50,10 @@
     package_data={"": ["pyoculus/problems/SPECfortran/*.f90"]},
     include_package_data=True,
     install_requires=[
-    "numpy",
+    "numpy>1.21.1",
     "scipy",
     "importlib-metadata ; python_version<'3.8'",
     "matplotlib",
     ],
-    ext_modules=[ext1],
-    setup_requires=["wheel"],
+    ext_modules=[ext1]
 )