From 3dd466c49806e012688396760f3eec4bc35dcb80 Mon Sep 17 00:00:00 2001 From: Ryan May Date: Mon, 30 Oct 2023 15:32:15 -0600 Subject: [PATCH] CI: Only build shapely from src on Minimum runs --- .github/actions/install-pypi/action.yml | 10 +++++++--- .github/workflows/tests-pypi.yml | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/actions/install-pypi/action.yml b/.github/actions/install-pypi/action.yml index 54cd9fe4b05..fced447bcb0 100644 --- a/.github/actions/install-pypi/action.yml +++ b/.github/actions/install-pypi/action.yml @@ -15,6 +15,10 @@ inputs: python-version: description: 'What version of Python to use' required: true + old-build: + description: 'Whether to enable old builds for shapely and cartopy' + required: false + default: false runs: using: composite @@ -30,13 +34,13 @@ runs: ci/extra_requirements.txt # This installs the stuff needed to build and install Shapely and CartoPy from source. - - name: Install CartoPy build dependencies - if: ${{ inputs.need-extras == 'true' }} + - name: Install CartoPy/Shapely build dependencies + if: ${{ inputs.old-build == 'true' }} shell: bash run: sudo apt-get install libgeos-dev - name: Disable Shapely Wheels - if: ${{ inputs.need-extras == 'true' }} + if: ${{ inputs.old-build == 'true' }} shell: bash run: echo "PIP_NO_BINARY=shapely" >> $GITHUB_ENV diff --git a/.github/workflows/tests-pypi.yml b/.github/workflows/tests-pypi.yml index 2f1df015f0f..d9c5dab440d 100644 --- a/.github/workflows/tests-pypi.yml +++ b/.github/workflows/tests-pypi.yml @@ -72,6 +72,7 @@ jobs: need-extras: ${{ matrix.no-extras != 'No Extras' }} type: 'test' python-version: ${{ matrix.python-version }} + old-build: ${{ matrix.no-extras != 'No Extras' && matrix.dep-versions == 'Minimum' }} - name: Run tests uses: ./.github/actions/run-tests