Skip to content

Commit 0255262

Browse files
committed
Let's try
1 parent b4cf281 commit 0255262

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.github/actions/install-pypi/action.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,25 @@ runs:
5656
echo "DEP_GROUPS=${{ inputs.type }}" >> $GITHUB_ENV
5757
fi
5858
59+
- name: Set install flags
60+
shell: bash
61+
run: echo "INSTALL_FLAGS=${{ env.INSTALL_FLAGS }}" >> $GITHUB_ENV
62+
63+
- name: Massage for backwards compatibility
64+
if: ${{ inputs.version-file && (inputs.install-flags == '') }}
65+
shell: bash
66+
run: echo "INSTALL_FLAGS=-c ci/${{ inputs.version-file }} -c ci-dev/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt" >> $GITHUB_ENV
67+
5968
- name: Install
6069
shell: bash
6170
run: >
62-
uv pip install --system ${{ inputs.install-flags }} ${{ inputs.install-target }}[${{ env.DEP_GROUPS }}]
63-
-c ci/${{ inputs.version-file }} -c ci-dev/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt
71+
uv pip install --system ${{ env.INSTALL_FLAGS }} ${{ inputs.install-target }}[${{ env.DEP_GROUPS }}]
6472
6573
- name: Install additional test tools
6674
if: ${{ inputs.type == 'test' }}
6775
shell: bash
6876
run: >
69-
uv pip install --system coverage
70-
-c ci/${{ inputs.version-file }} -c ci-dev/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt
77+
uv pip install --system $${{ env.INSTALL_FLAGS }} coverage
7178
7279
- name: Download Cartopy Maps
7380
if: ${{ inputs.need-cartopy == 'true' }}

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,17 @@ jobs:
5353
persist-credentials: false
5454

5555
- uses: actions/download-artifact@v8
56+
with:
57+
name: wheels-${{ matrix.platform }}
5658

5759
- name: Set flag to install minimum dependencies
5860
if: ${{ matrix.dep-versions == 'Minimum' }}
5961
run: echo "INSTALL_FLAGS=${{ env.INSTALL_FLAGS }} --resolution=lowest-direct" >> $GITHUB_ENV
6062

63+
- name: Set flag to constrain CI dependencies
64+
if: ${{ matrix.dep-versions == 'Latest' }}
65+
run: echo "INSTALL_FLAGS=${{ env.INSTALL_FLAGS }} -c ci/requirements.txt -c ci-dev/${{ inputs.type }}_requirements.txt -c ci/extra_requirements.txt" >> $GITHUB_ENV
66+
6167
- name: Install from PyPI
6268
uses: ./.github/actions/install-pypi
6369
with:

0 commit comments

Comments
 (0)