Skip to content

Commit

Permalink
CI: Simplify dependency installs for Cartopy
Browse files Browse the repository at this point in the history
This should be easier now with newer versions of Cartopy.
  • Loading branch information
dopplershift committed Oct 20, 2021
1 parent b69035f commit eff46bf
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,11 @@ jobs:
pip-docs-
# This installs the stuff needed to build and install Shapely and CartoPy from source.
# Need to install numpy first to make CartoPy happy.
- name: Install dependencies (PyPI)
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get install libgeos-dev libproj-dev proj-bin
python -m pip install --upgrade pip setuptools
python -m pip install --no-binary :all: shapely
python -m pip install -c ci/${{ matrix.dep-versions }} numpy
python -m pip install -r ci/doc_requirements.txt -r ci/extra_requirements.txt -c ci/${{ matrix.dep-versions }}
- name: Download Cartopy Maps
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/tests-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,11 @@ jobs:
EOF
# This installs the stuff needed to build and install Shapely and CartoPy from source.
# Need to install numpy first to make CartoPy happy.
- name: Install CartoPy build dependencies
if: ${{ matrix.no-extras != 'No Extras' }}
run: |
sudo apt-get install libgeos-dev libproj-dev proj-bin
python -m pip install --no-binary :all: shapely
python -m pip install -c ci/${{ matrix.dep-versions }} numpy
- name: Install test dependencies
run: python -m pip install -r ci/test_requirements.txt -c ci/${{ matrix.dep-versions }}
Expand Down

0 comments on commit eff46bf

Please sign in to comment.