Merge branch 'main' into expose_sim_param

LCAV · Jul 9, 2024 · 10d3bd9 · 10d3bd9
2 parents 7cace0e + 8ed5136
commit 10d3bd9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/python_no_pycsou.yml b/.github/workflows/python_no_pycsou.yml
@@ -20,10 +20,8 @@ jobs:
       fail-fast: false
       max-parallel: 12
       matrix:
-        # TODO: use below with this issue is resolved: https://github.com/actions/setup-python/issues/808
-        # os: [ubuntu-latest, macos-latest, windows-latest]
-        os: [ubuntu-latest, macos-12, windows-latest]
-        python-version: [3.8, "3.11"]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.11"]
     steps:
     - uses: actions/checkout@v3
     - name: Checkout submodules

diff --git a/.github/workflows/python_pycsou.yml b/.github/workflows/python_pycsou.yml
@@ -20,9 +20,7 @@ jobs:
       fail-fast: false
       max-parallel: 12
       matrix:
-        # TODO: use below with this issue is resolved: https://github.com/actions/setup-python/issues/808
-        # os: [ubuntu-latest, macos-latest, windows-latest]
-        os: [ubuntu-latest, macos-12, windows-latest]
+        os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: [3.9, "3.10"]
     steps:
     - uses: actions/checkout@v3

diff --git a/setup.py b/setup.py
@@ -27,7 +27,8 @@
     python_requires=">=3.8.1, <=3.11.9",
     install_requires=[
         "opencv-python>=4.5.1.48",
-        "numpy>=1.26",
+        "numpy==1.26.4; python_version=='3.11'",
+        "numpy>=1.22",
         "scipy>=1.7.0",
         "image>=1.5.33",
         "matplotlib>=3.4.2",