Skip to content

Commit 4c2e755

Browse files
committed
simplify
1 parent 584f134 commit 4c2e755

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

.github/workflows/pytest-remote-data.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: pytest-remote-data
22

33
on:
4+
# use pull_request_target, in combination with the `remote-data` label (below)
5+
# so that we can access repository secrets.
6+
# https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
47
pull_request_target:
58
types: [labeled]
69

@@ -31,11 +34,6 @@ jobs:
3134
with:
3235
ref: ${{ github.event.pull_request.head.sha }}
3336

34-
- name: Set up Python ${{ matrix.python-version }}${{ matrix.suffix }}
35-
uses: actions/setup-python@v1
36-
with:
37-
python-version: ${{ matrix.python-version }}
38-
3937
- name: Set up conda environment
4038
uses: conda-incubator/setup-miniconda@v2
4139
with:

.github/workflows/pytest.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ jobs:
3333
steps:
3434
- uses: actions/checkout@v2
3535

36-
- name: Set up Python ${{ matrix.python-version }}${{ matrix.suffix }}
37-
uses: actions/setup-python@v1
38-
with:
39-
python-version: ${{ matrix.python-version }}
40-
4136
- name: Set up conda environment
4237
if: matrix.environment-type == 'conda'
4338
uses: conda-incubator/setup-miniconda@v2
@@ -51,8 +46,11 @@ jobs:
5146
# version, mapping from "3.7" to "37", second is to add "-min" if needed
5247
REQUIREMENTS: ci/requirements-py${{ fromJSON(env.VERSIONMAP)[matrix.python-version] }}${{ matrix.suffix }}.yml
5348

54-
- name: Create bare environment
49+
- name: Set up bare Python ${{ matrix.python-version }}${{ matrix.suffix }} environment
5550
if: matrix.environment-type == 'bare'
51+
uses: actions/setup-python@v1
52+
with:
53+
python-version: ${{ matrix.python-version }}
5654
run: |
5755
pip install .[test]
5856

0 commit comments

Comments
 (0)