From aaaddad3616dc2a9b4470a20f0985902427a5b3d Mon Sep 17 00:00:00 2001 From: Dugal Harris Date: Mon, 17 Jun 2024 12:58:38 +0200 Subject: [PATCH] install "numpy<2" to avoid conflicts with opencv --- .github/workflows/run-unit-tests_conda-forge.yml | 4 ++-- .github/workflows/run-unit-tests_pypi.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-unit-tests_conda-forge.yml b/.github/workflows/run-unit-tests_conda-forge.yml index 45a2f8c..265b1d8 100644 --- a/.github/workflows/run-unit-tests_conda-forge.yml +++ b/.github/workflows/run-unit-tests_conda-forge.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [ macos-latest, ubuntu-latest, windows-latest ] - python-version: ['3.9', '3.11', '3.12'] + python-version: ['3.8', '3.11', '3.12'] steps: - name: Check out repository @@ -35,7 +35,7 @@ jobs: - name: Install dependencies run: | conda info - conda install -c conda-forge rasterio opencv click tqdm pyyaml fsspec requests aiohttp pytest pytest-cov + conda install -c conda-forge rasterio opencv "numpy<2" click tqdm pyyaml fsspec requests aiohttp pytest pytest-cov conda list - name: Install OpenCV Linux dependencies diff --git a/.github/workflows/run-unit-tests_pypi.yml b/.github/workflows/run-unit-tests_pypi.yml index e6953dc..901888a 100644 --- a/.github/workflows/run-unit-tests_pypi.yml +++ b/.github/workflows/run-unit-tests_pypi.yml @@ -33,7 +33,7 @@ jobs: run: | python -m pip install --upgrade pip python -m pip install flake8 pytest pytest-cov - python -m pip install rasterio opencv-python-headless click tqdm pyyaml fsspec requests aiohttp + python -m pip install rasterio opencv-python-headless "numpy<2" click tqdm pyyaml fsspec requests aiohttp python -m pip list - name: Lint with flake8