From 456ccfff4c1759711b233eadfc7db7b54b969978 Mon Sep 17 00:00:00 2001 From: patrick kenneally Date: Mon, 17 Jun 2024 13:55:26 -0600 Subject: [PATCH] Limit numpy to below 2.0.0 This is a temporary restraint until the rest of the project catches up with numpy 2.0.0 compatibility. --- .github/workflows/pull-request.yml | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 838c7f6181..f4acff5d87 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -67,7 +67,7 @@ jobs: source .venv/bin/activate echo "VIRTUAL ENV:" $VIRTUAL_ENV - name: "Install wheel and conan package" - run: source .venv/bin/activate && pip3 install wheel conan==1.61.0 pytest datashader holoviews pytest-xdist + run: source .venv/bin/activate && pip3 install -r requirements.txt - name: "Build basilisk" run: source .venv/bin/activate && python3 conanfile.py --opNav True - name: "Run Python Tests" @@ -139,7 +139,7 @@ jobs: shell: pwsh run: | venv\Scripts\activate - pip install wheel conan==1.61.0 parse six pytest-xdist + pip install -r requirements.txt - name: "Add basilisk and cmake path to env path" shell: pwsh run: | diff --git a/requirements.txt b/requirements.txt index d365ea3634..95be685bbc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,4 @@ pytest pytest-html pytest-xdist matplotlib -numpy +numpy<2.0.0