From bb4aaac4fec678801d589d86075f9d450c2d8e6c Mon Sep 17 00:00:00 2001
From: Ryan May <rmay31@gmail.com>
Date: Thu, 31 Oct 2024 15:57:15 -0600
Subject: [PATCH] CI: Separate out Cartopy from extras in PyPI setup

This allows Siphon to reuse the action.
---
 .github/actions/install-pypi/action.yml | 6 +++++-
 .github/workflows/docs.yml              | 1 +
 .github/workflows/tests-pypi.yml        | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/actions/install-pypi/action.yml b/.github/actions/install-pypi/action.yml
index db05ba94a75..64ddc64eadb 100644
--- a/.github/actions/install-pypi/action.yml
+++ b/.github/actions/install-pypi/action.yml
@@ -19,6 +19,10 @@ inputs:
     description: 'Whether to enable old builds for shapely and cartopy'
     required: false
     default: 'false'
+  need-cartopy:
+    description: 'Whether Cartopy support is needed'
+    required: false
+    default: 'false'
 
 runs:
   using: composite
@@ -74,7 +78,7 @@ runs:
         -c ci/${{ inputs.version-file }} -c ci/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt
 
     - name: Download Cartopy Maps
-      if: ${{ inputs.need-extras == 'true' }}
+      if: ${{ inputs.need-cartopy == 'true' }}
       shell: bash
       run: ci/download_cartopy_maps.py
 
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 5eca0ec8f94..8806e70b383 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -50,6 +50,7 @@ jobs:
         type: 'doc'
         python-version: ${{ matrix.python-version }}
         need-extras: true
+        need-cartopy: true
 
     - name: Build docs
       id: build-docs
diff --git a/.github/workflows/tests-pypi.yml b/.github/workflows/tests-pypi.yml
index fcc1657779d..788d1a66658 100644
--- a/.github/workflows/tests-pypi.yml
+++ b/.github/workflows/tests-pypi.yml
@@ -76,6 +76,7 @@ jobs:
         type: 'test'
         python-version: ${{ matrix.python-version }}
         old-build: ${{ matrix.no-extras != 'No Extras' && matrix.dep-versions == 'Minimum' }}
+        need-cartopy: ${{ matrix.no-extras != 'No Extras' }}
 
     - name: Run tests
       uses: ./.github/actions/run-tests