Skip to content

Commit

Permalink
Pin numpy, pyproj based on Python version
Browse files Browse the repository at this point in the history
  • Loading branch information
chuckwondo committed May 14, 2024
1 parent ce4208e commit b2aa7a8
Show file tree
Hide file tree
Showing 4 changed files with 104 additions and 13 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ jobs:
if: steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- name: Install Dependencies
# Retry the installation command in case of transient network issues
if: ${{ !env.ACT }}
run: poetry install
- name: Install Dependencies
if: ${{ env.ACT }}
# When using `act` to run the workflow locally, the `poetry install` command
# may fail due to network issues when running multiple Docker containers.
run: poetry install || poetry install || poetry install
- name: Test
env:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ jobs:
if: steps.cache.outputs.cache-hit == 'true'
run: poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
- name: Install Dependencies
# Retry the installation command in case of transient network issues
if: ${{ !env.ACT }}
run: poetry install
- name: Install Dependencies
if: ${{ env.ACT }}
# When using `act` to run the workflow locally, the `poetry install` command
# may fail due to network issues when running multiple Docker containers.
run: poetry install || poetry install || poetry install
- name: Test
run: poetry run bash scripts/test.sh
Expand Down
90 changes: 83 additions & 7 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 9 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,11 @@ fsspec = ">=2022.11"
tinynetrc = "^1.3.1"
multimethod = ">=1.8"
kerchunk = { version = ">=0.1.2", optional = true }
# kerchunk requires numpy, but we need numpy >=1.26.0 for Python 3.12 support
numpy = { version = ">=1.26.0", optional = true, python = ">=3.12" }
# kerchunk requires numpy
numpy = [
{ version = "<1.26.0", optional = true, python = "<3.9" },
{ version = ">=1.26.0", optional = true, python = ">=3.12" }
]
dask = { version = ">=2022.1.0", optional = true }
importlib-resources = ">=6.3.2"
typing_extensions = ">=4.10.0"
Expand Down Expand Up @@ -82,8 +85,10 @@ widgetsnbextension = ">=3.6.0"
xarray = ">=2023.01"
matplotlib = ">=3.3"
h5netcdf = ">=0.11"
dask = ">=2022.1"
pyproj = ">=3.5.0"
pyproj = [
{ version = ">=3.5.0", python = "<3.12" },
{ version = ">=3.6.1", python = ">=3.12" }
]
bump-my-version = ">=0.10.0"
vcrpy = ">=6.0.1"
# The following error occurs when building the docs, so we must explicitly
Expand Down

0 comments on commit b2aa7a8

Please sign in to comment.