From cf9fbf70150c9738de521e9dd7fd377da88de237 Mon Sep 17 00:00:00 2001
From: Navaneet Villodi <11260095+nauaneed@users.noreply.github.com>
Date: Tue, 28 Nov 2023 17:43:36 +0530
Subject: [PATCH] fix(tests): pin python<3.0

With Cython 3.0, on github actions:
- All openmp tests fail on windows.
- Elliptical drop with openmp fails on ubuntu due to timeout.
- All openmp tests pass on macos runner
- test_compressed_octree_has_lesser_depth_than_octree fails

Pinning cython<3.0 to fix these failures.
---
 .github/workflows/tests.yml        | 2 +-
 .github/workflows/zoltan-tests.yml | 2 +-
 pyproject.toml                     | 2 +-
 requirements.txt                   | 2 +-
 setup.py                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d85b3c34..4a866122 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Install dependencies
         run: |
           conda info
-          conda install -c conda-forge numpy cython h5py
+          conda install -c conda-forge numpy 'cython<3.0' h5py
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install https://github.com/pypr/cyarray/zipball/master
           python -m pip install https://github.com/pypr/compyle/zipball/master
diff --git a/.github/workflows/zoltan-tests.yml b/.github/workflows/zoltan-tests.yml
index 8dd11c91..9f67ab2f 100644
--- a/.github/workflows/zoltan-tests.yml
+++ b/.github/workflows/zoltan-tests.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Install dependencies
         run: |
           conda info
-          conda install -c conda-forge numpy cython
+          conda install -c conda-forge numpy 'cython<3.0'
           python -m pip install --upgrade pip setuptools wheel
           python -m pip install mpi4py
           python -m pip install https://github.com/pypr/cyarray/zipball/master
diff --git a/pyproject.toml b/pyproject.toml
index ece6eb95..5aa017ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [build-system]
 requires = [
     "Beaker",
-    "Cython>=0.20",
+    "Cython<3.0",
     "compyle>=0.8",
     "cyarray",
     "mako",
diff --git a/requirements.txt b/requirements.txt
index ccb71adf..5426b1f9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 numpy
 setuptools>=42.0.0
-Cython>=0.20
+Cython<3.0
 cyarray
 compyle>=0.8
 mako
diff --git a/setup.py b/setup.py
index 9c528fc4..ae13fc67 100644
--- a/setup.py
+++ b/setup.py
@@ -681,7 +681,7 @@ def setup_package():
 
     # The requirements.
     install_requires = [
-        'numpy', 'mako', 'cyarray', 'compyle>=0.8', 'Cython>=0.20',
+        'numpy', 'mako', 'cyarray', 'compyle>=0.8', 'Cython<3.0',
         'setuptools>=42.0.0', 'pytools', 'Beaker'
     ]
     tests_require = ['pytest>=3.0', 'h5py', 'vtk']