From 48487cd7ab4480cedb71eda1511054210a6a2bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Sell=C3=A1n?= Date: Sat, 22 Jun 2024 11:08:25 -0400 Subject: [PATCH 1/6] numpy setup --- pyproject.toml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0389c2a3..152be3a8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ build-verbosity = "3" [build-system] requires = [ - "numpy", + "numpy<2", "scipy", "setuptools>=42", "wheel", diff --git a/setup.py b/setup.py index 59c12735..e6dd27af 100644 --- a/setup.py +++ b/setup.py @@ -115,7 +115,7 @@ def main(): license="MIT", package_dir={'': 'src'}, packages=setuptools.find_packages(where="src"), - install_requires=['numpy', 'scipy', 'scikit-image'], + install_requires=['numpy<2', 'scipy', 'scikit-image'], ext_modules=[CMakeExtension('.', exclude_arch=exclude_arch)], setup_requires=['pybind11>=2.4'], cmdclass=dict(build_ext=CMakeBuild), From 3e90a9e99fedfd30a6056a8c14635737728e1373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Sell=C3=A1n?= Date: Sat, 22 Jun 2024 11:08:53 -0400 Subject: [PATCH 2/6] numpy version --- .github/workflows/linux_build.yml | 2 +- .github/workflows/macos_build.yml | 2 +- .github/workflows/windows_build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index f4448e2e..d32764e5 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies shell: bash -l {0} run: | - python -m pip install numpy + python -m pip install numpy<2 python -m pip install scipy python -m pip install scikit-image sudo apt-get install \ diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 6da9d9ed..9376feca 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies shell: bash -l {0} run: | - ${{ steps.installpython.outputs.python-path }} -m pip install numpy + ${{ steps.installpython.outputs.python-path }} -m pip install numpy<2 ${{ steps.installpython.outputs.python-path }} -m pip install scipy ${{ steps.installpython.outputs.python-path }} -m pip install scikit-image diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index d99f0530..e9e1f21d 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies (Windows) shell: bash -l {0} run: | - python -m pip install numpy + python -m pip install numpy<2 python -m pip install scipy python -m pip install scikit-image From 4f5e7ed10e038f5ef5335ba61747cf9de8f818c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Sell=C3=A1n?= Date: Sat, 22 Jun 2024 11:20:46 -0400 Subject: [PATCH 3/6] duh --- .github/workflows/linux_build.yml | 2 +- .github/workflows/macos_build.yml | 2 +- .github/workflows/windows_build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index d32764e5..93d7ca83 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies shell: bash -l {0} run: | - python -m pip install numpy<2 + python -m pip install numpy<2.0.0 python -m pip install scipy python -m pip install scikit-image sudo apt-get install \ diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 9376feca..e9774b75 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies shell: bash -l {0} run: | - ${{ steps.installpython.outputs.python-path }} -m pip install numpy<2 + ${{ steps.installpython.outputs.python-path }} -m pip install numpy<2.0.0 ${{ steps.installpython.outputs.python-path }} -m pip install scipy ${{ steps.installpython.outputs.python-path }} -m pip install scikit-image diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index e9e1f21d..fea44049 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies (Windows) shell: bash -l {0} run: | - python -m pip install numpy<2 + python -m pip install numpy<2.0.0 python -m pip install scipy python -m pip install scikit-image From 4e06d935762e6470b88856cbddf7689e09103ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Sell=C3=A1n?= Date: Sat, 22 Jun 2024 11:35:55 -0400 Subject: [PATCH 4/6] ??? --- .github/workflows/linux_build.yml | 2 +- .github/workflows/macos_build.yml | 2 +- .github/workflows/windows_build.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 93d7ca83..c7ae810c 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies shell: bash -l {0} run: | - python -m pip install numpy<2.0.0 + python -m pip install numpy<=1.96.0 python -m pip install scipy python -m pip install scikit-image sudo apt-get install \ diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index e9774b75..98365418 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies shell: bash -l {0} run: | - ${{ steps.installpython.outputs.python-path }} -m pip install numpy<2.0.0 + ${{ steps.installpython.outputs.python-path }} -m pip install numpy<=1.96.0 ${{ steps.installpython.outputs.python-path }} -m pip install scipy ${{ steps.installpython.outputs.python-path }} -m pip install scikit-image diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index fea44049..4604a682 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies (Windows) shell: bash -l {0} run: | - python -m pip install numpy<2.0.0 + python -m pip install numpy<=1.96.0 python -m pip install scipy python -m pip install scikit-image From fdfecf68ba7a68900e70b80b3542027f853100a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Sell=C3=A1n?= Date: Sat, 22 Jun 2024 12:02:57 -0400 Subject: [PATCH 5/6] wtf?? --- .github/workflows/macos_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 98365418..5eb5dc5a 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies shell: bash -l {0} run: | - ${{ steps.installpython.outputs.python-path }} -m pip install numpy<=1.96.0 + ${{ steps.installpython.outputs.python-path }} -m pip install "numpy<=1.96.0" ${{ steps.installpython.outputs.python-path }} -m pip install scipy ${{ steps.installpython.outputs.python-path }} -m pip install scikit-image From a42f998314307a92cdaa6bf529eb97a0974876e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Silvia=20Sell=C3=A1n?= Date: Sat, 22 Jun 2024 12:27:05 -0400 Subject: [PATCH 6/6] typo... --- .github/workflows/linux_build.yml | 2 +- .github/workflows/windows_build.yml | 2 +- pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index c7ae810c..c437f8c1 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies shell: bash -l {0} run: | - python -m pip install numpy<=1.96.0 + python -m pip install "numpy<=1.96.0" python -m pip install scipy python -m pip install scikit-image sudo apt-get install \ diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 4604a682..3659d091 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies (Windows) shell: bash -l {0} run: | - python -m pip install numpy<=1.96.0 + python -m pip install "numpy<=1.96.0" python -m pip install scipy python -m pip install scikit-image diff --git a/pyproject.toml b/pyproject.toml index 152be3a8..25e13a52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ build-verbosity = "3" [build-system] requires = [ - "numpy<2", + "numpy<=1.96.0", "scipy", "setuptools>=42", "wheel",