Bump numpy version to 2.2

This change also removes support for 3.9.

Author: rycwo

.github/workflows/python-package.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

metafold/func_types.py

@@ -27,39 +27,39 @@
 
 Vec2i: TypeAlias = Union[
     Annotated[list[int], 2],
-    "np.ndarray[Literal[2], np.dtype[np.int_]]",
+    "np.ndarray[tuple[Literal[2]], np.dtype[np.int32]]",
 ]
 Vec2f: TypeAlias = Union[
     Annotated[list[float], 2],
-    "np.ndarray[Literal[2], np.dtype[np.float_]]",
+    "np.ndarray[tuple[Literal[2]], np.dtype[np.float32]]",
 ]
 Vec3i: TypeAlias = Union[
     Annotated[list[int], 3],
-    "np.ndarray[Literal[3], np.dtype[np.int_]]",
+    "np.ndarray[tuple[Literal[3]], np.dtype[np.int32]]",
 ]
 Vec3f: TypeAlias = Union[
     Annotated[list[float], 3],
-    "np.ndarray[Literal[3], np.dtype[np.float_]]",
+    "np.ndarray[tuple[Literal[3]], np.dtype[np.float32]]",
 ]
 Vec4i: TypeAlias = Union[
     Annotated[list[int], 4],
-    "np.ndarray[Literal[4], np.dtype[np.int_]]",
+    "np.ndarray[tuple[Literal[4]], np.dtype[np.int32]]",
 ]
 Vec4f: TypeAlias = Union[
     Annotated[list[float], 4],
-    "np.ndarray[Literal[4], np.dtype[np.float_]]",
+    "np.ndarray[tuple[Literal[4]], np.dtype[np.float32]]",
 ]
 Mat2f: TypeAlias = Union[
     Annotated[list[float], 4],
-    "np.ndarray[tuple[Literal[2], Literal[2]], np.dtype[np.float_]]",
+    "np.ndarray[tuple[Literal[2], Literal[2]], np.dtype[np.float32]]",
 ]
 Mat3f: TypeAlias = Union[
     Annotated[list[float], 9],
-    "np.ndarray[tuple[Literal[3], Literal[3]], np.dtype[np.float_]]",
+    "np.ndarray[tuple[Literal[3], Literal[3]], np.dtype[np.float32]]",
 ]
 Mat4f: TypeAlias = Union[
     Annotated[list[float], 16],
-    "np.ndarray[tuple[Literal[4], Literal[4]], np.dtype[np.float_]]",
+    "np.ndarray[tuple[Literal[4], Literal[4]], np.dtype[np.float32]]",
 ]
 
 

pyproject.toml

@@ -4,21 +4,21 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "metafold"
-version = "0.8.0"
+version = "0.9.0"
 authors = [
     {name = "Metafold 3D", email = "info@metafold3d.com"},
 ]
 dependencies = [
     "attrs~=23.2",
     "auth0-python~=4.7",
-    "numpy~=1.23",
+    "numpy~=2.1",
     "requests~=2.31",
     "scipy~=1.11",
 ]
 readme = "README.md"
 license = {file = "LICENSE"}
 description = "Metafold SDK for Python"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 keywords = ["metafold", "api", "sdk", "implicit geometry"]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -59,3 +59,6 @@ networkx = [
 
 [tool.setuptools]
 packages = ["metafold"]
+
+[tool.ruff.lint]
+select = ["NPY201"]

requirements-test.txt

@@ -1,6 +1,6 @@
 attrs~=23.2
 auth0-python~=4.7
-numpy~=1.23
+numpy~=2.1
 requests~=2.31
 scipy~=1.11
 

requirements.txt

@@ -1,5 +1,5 @@
 attrs~=23.2
 auth0-python~=4.7
-numpy~=1.23
+numpy~=2.1
 requests~=2.31
 scipy~=1.11

tests/test_func.py

@@ -77,7 +77,7 @@ def test_build_graph_json():
         Redistance(
             CSGIntersect(
                 SampleSurfaceLattice(source, gyroidParams),
-                EllipsoidPrimitive(source, {"size": np.array([1, 1, 1])}),
+                EllipsoidPrimitive(source, {"size": [1.0, 1.0, 1.0]}),
             ),
         ),
     )
@@ -91,7 +91,7 @@ def test_build_graph_json():
         Redistance(
             CSGIntersect(
                 SampleSurfaceLattice(PointSource, gyroidParams),
-                EllipsoidPrimitive(PointSource, {"size": np.array([1, 1, 1])}),
+                EllipsoidPrimitive(PointSource, {"size": [1.0, 1.0, 1.0]}),
             ),
         ),
     )
@@ -184,7 +184,7 @@ def test_build_nx_graph():
         Redistance(
             CSGIntersect(
                 SampleSurfaceLattice(source, gyroidParams),
-                EllipsoidPrimitive(source, {"size": np.array([1, 1, 1])}),
+                EllipsoidPrimitive(source, {"size": [1.0, 1.0, 1.0]}),
             ),
         ),
     )
@@ -201,7 +201,7 @@ def test_build_nx_graph():
         Redistance(
             CSGIntersect(
                 SampleSurfaceLattice(PointSource, gyroidParams),
-                EllipsoidPrimitive(PointSource, {"size": np.array([1, 1, 1])}),
+                EllipsoidPrimitive(PointSource, {"size": [1.0, 1.0, 1.0]}),
             ),
         ),
     )