From 2fe81d398e11a1b897d2cc68a1a79a64784d365d Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 18 Jun 2024 09:57:25 -0400 Subject: [PATCH 1/3] Pin numpy to a version less than 2 --- .github/workflows/test.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ee92a1bc..b066e486 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel setuptools python -m pip install mako - python -m pip install numpy scipy matplotlib docutils pytest sphinx bumps unittest-xml-reporting tinycc + python -m pip install numpy<2 scipy matplotlib docutils pytest sphinx bumps unittest-xml-reporting tinycc - name: setup pyopencl on Linux + macOS if: ${{ matrix.os != 'windows-latest' }} diff --git a/setup.py b/setup.py index 89f3203b..c04a4a13 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def find_version(package): return version[1:-1] raise RuntimeError("Could not read version from %s/__init__.py"%package) -install_requires = ['numpy', 'scipy'] +install_requires = ['numpy<2', 'scipy'] with open('README.rst') as fid: long_description = fid.read() From e33bafbd19631433c1e88484bc7d4c610d18a75c Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 18 Jun 2024 10:04:30 -0400 Subject: [PATCH 2/3] Set number to 2.0 --- .github/workflows/test.yml | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b066e486..2a45c789 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel setuptools python -m pip install mako - python -m pip install numpy<2 scipy matplotlib docutils pytest sphinx bumps unittest-xml-reporting tinycc + python -m pip install numpy<2.0 scipy matplotlib docutils pytest sphinx bumps unittest-xml-reporting tinycc - name: setup pyopencl on Linux + macOS if: ${{ matrix.os != 'windows-latest' }} diff --git a/setup.py b/setup.py index c04a4a13..0c7a7729 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def find_version(package): return version[1:-1] raise RuntimeError("Could not read version from %s/__init__.py"%package) -install_requires = ['numpy<2', 'scipy'] +install_requires = ['numpy<2.0', 'scipy'] with open('README.rst') as fid: long_description = fid.read() From 1635e510f6a66782285b4602be6bda1c087ad1bd Mon Sep 17 00:00:00 2001 From: krzywon Date: Tue, 18 Jun 2024 10:08:10 -0400 Subject: [PATCH 3/3] Use version 1.* --- .github/workflows/test.yml | 3 ++- setup.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2a45c789..a0770713 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,8 @@ jobs: python -m pip install --upgrade pip python -m pip install wheel setuptools python -m pip install mako - python -m pip install numpy<2.0 scipy matplotlib docutils pytest sphinx bumps unittest-xml-reporting tinycc + python -m pip install numpy==1.* + python -m pip install scipy matplotlib docutils pytest sphinx bumps unittest-xml-reporting tinycc - name: setup pyopencl on Linux + macOS if: ${{ matrix.os != 'windows-latest' }} diff --git a/setup.py b/setup.py index 0c7a7729..33edf680 100644 --- a/setup.py +++ b/setup.py @@ -29,7 +29,7 @@ def find_version(package): return version[1:-1] raise RuntimeError("Could not read version from %s/__init__.py"%package) -install_requires = ['numpy<2.0', 'scipy'] +install_requires = ['numpy==1.*', 'scipy'] with open('README.rst') as fid: long_description = fid.read()