glotzerlab · tommy-waltmann · Sep 1, 2023 · Aug 28, 2023 · Aug 29, 2023 · Aug 29, 2023
diff --git a/.github/workflows/oldest-test-reqs.txt b/.github/workflows/oldest-test-reqs.txt
@@ -1,6 +1,6 @@
 ase==3.16.0
 cmake==3.13.0
-cython==0.29.14
+cython==3.0.2
 dynasor==1.1b0; platform_system != "Windows"
 gsd==2.4.2
 matplotlib==3.0.0

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -9,6 +9,9 @@ and this project adheres to
 ### Added
 * The `gsd.hoomd.Frame` class is supported as a system-like input.
 
+### Changed
+* Require building with cython>=3.0.2
+
 ## v2.13.0 -- 2023-05-09
 
 ### Added

diff --git a/benchmarks/benchmarker.py b/benchmarks/benchmarker.py
@@ -239,9 +239,9 @@ def list_benchmark_modules():
     """
     import glob
 
-    modules = glob.glob(os.path.join(os.path.dirname(__file__), "benchmark_*"))
-    prefixdir = "benchmarks/"
-    modules = [f[len(prefixdir) : -3] for f in modules]
+    dir_path = os.path.dirname(__file__)
+    modules = glob.glob(os.path.join(dir_path, "benchmark_*"))
+    modules = [f[len(dir_path) + 1 : -3] for f in modules]
     return modules
 
 

diff --git a/benchmarks/reports/benchmark.json b/benchmarks/reports/benchmark.json
@@ -692,5 +692,6 @@
                 ]
             ]
         }
-    ]
+    ],
+    "5ddf603fa828b2130199b90d39fe4cb02072007c": []
 }
diff --git a/doc/source/reference/credits.rst b/doc/source/reference/credits.rst
@@ -337,6 +337,7 @@ Tommy Waltmann
 * Contributed code, design, documentation, and testing for ``freud.locality.FilterRAD`` class.
 * Fixed segfault in neighborlists owned by compute objects.
 * Added support for ``gsd.hoomd.Frame`` in ``NeighborQuery.from_system`` calls.
+* Added support for building with cython 3.0
 
 Maya Martirossyan
 

diff --git a/freud/box.pyx b/freud/box.pyx
@@ -718,15 +718,7 @@ cdef class Box:
             pass
         return NotImplemented
 
-    def __mul__(arg1, arg2):
-        # Note Cython treats __mul__ and __rmul__ as one operation, so
-        # type checks are necessary.
-        if isinstance(arg1, freud.box.Box):
-            self = arg1
-            scale = arg2
-        else:
-            scale = arg1
-            self = arg2
+    def __mul__(self, scale):
         if scale > 0:
             return self.__class__(Lx=self.Lx*scale,
                                   Ly=self.Ly*scale,
@@ -736,6 +728,9 @@ cdef class Box:
         else:
             raise ValueError("Box can only be multiplied by positive values.")
 
+    def __rmul__(self, scale):
+        return self * scale
+
     def plot(self, title=None, ax=None, image=[0, 0, 0], *args, **kwargs):
         """Plot a :class:`~.box.Box` object.
 

diff --git a/freud/locality.pyx b/freud/locality.pyx
@@ -201,8 +201,6 @@ cdef class NeighborQueryResult:
             yield (npoint.query_point_idx, npoint.point_idx, npoint.distance)
             npoint = dereference(iterator).next()
 
-        raise StopIteration
-
     def toNeighborList(self, sort_by_distance=False):
         """Convert query result to a freud :class:`~NeighborList`.
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "wheel", "oldest-supported-numpy", "cython>=0.29.14,<3.0.0", "scikit-build>=0.17.3", "cmake"]
+requires = ["setuptools", "wheel", "oldest-supported-numpy", "cython>=3.0.2", "scikit-build>=0.17.3", "cmake"]
 
 [tool.black]
 target-version = ['py36']

diff --git a/requirements/requirements-test-compatible.txt b/requirements/requirements-test-compatible.txt
@@ -1,7 +1,7 @@
 ase>=3.16.0
 cmake>=3.13.0
 coverage>=6.2
-cython>=0.29.14, <3.0.0
+cython>=3.0.2
 dynasor>=1.1b0; platform_system != "Windows"
 GitPython>=3.1.24
 gsd>=2.4.2

diff --git a/requirements/requirements-test.txt b/requirements/requirements-test.txt
@@ -1,7 +1,7 @@
 ase==3.22.1
 cmake==3.27.0
 coverage==7.2.7
-cython==0.29.35
+cython==3.0.2
 dynasor==1.1.1; platform_system != "Windows"
 GitPython==3.1.32
 gsd==3.1.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -692,5 +692,6 @@ @@
                     ]
                 ]
             }
-        ]
+        ],
+        "5ddf603fa828b2130199b90d39fe4cb02072007c": []
     }