From eff46bf30c910a0db420da377b099a0396f4d584 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Wed, 29 Sep 2021 13:29:17 -0600 Subject: [PATCH] CI: Simplify dependency installs for Cartopy This should be easier now with newer versions of Cartopy. --- .github/workflows/docs.yml | 3 --- .github/workflows/tests-pypi.yml | 2 -- 2 files changed, 5 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 121b1198bc2..bc5b8039800 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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 diff --git a/.github/workflows/tests-pypi.yml b/.github/workflows/tests-pypi.yml index 7f813f57058..f857e183f91 100644 --- a/.github/workflows/tests-pypi.yml +++ b/.github/workflows/tests-pypi.yml @@ -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 }}