Skip to content

Commit 64919f3

Browse files
force tox to use setup step python path
1 parent e631c4f commit 64919f3

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

.github/workflows/github-actions.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,63 +18,54 @@ jobs:
1818
include:
1919
- name: 'check'
2020
python: '3.11'
21-
toxpython: 'python3.11'
2221
tox_env: 'check'
2322
os: 'ubuntu-latest'
23+
python_arch: 'x64'
2424
- name: 'docs'
2525
python: '3.11'
26-
toxpython: 'python3.11'
2726
tox_env: 'docs'
2827
os: 'ubuntu-latest'
28+
python_arch: 'x64'
2929
- name: 'py38 (ubuntu)'
3030
python: '3.8'
31-
toxpython: 'python3.8'
3231
python_arch: 'x64'
3332
tox_env: 'py38'
3433
os: 'ubuntu-latest'
3534
- name: 'py39 (ubuntu)'
3635
python: '3.9'
37-
toxpython: 'python3.9'
3836
python_arch: 'x64'
3937
tox_env: 'py39'
4038
os: 'ubuntu-latest'
4139
- name: 'py39 (windows)'
4240
python: '3.9'
43-
toxpython: 'python3.9'
4441
python_arch: 'x64'
4542
tox_env: 'py39'
4643
os: 'windows-latest'
4744
- name: 'py310 (ubuntu)'
4845
python: '3.10'
49-
toxpython: 'python3.10'
5046
python_arch: 'x64'
5147
tox_env: 'py310'
5248
os: 'ubuntu-latest'
5349
- name: 'py310 (windows)'
5450
python: '3.10'
55-
toxpython: 'python3.10'
5651
python_arch: 'x64'
5752
tox_env: 'py310'
5853
os: 'windows-latest'
5954
- name: 'py311 (ubuntu)'
6055
python: '3.11'
61-
toxpython: 'python3.11'
6256
python_arch: 'x64'
6357
tox_env: 'py311'
6458
os: 'ubuntu-latest'
6559
- name: 'py311 (macos)'
6660
python: '3.11'
67-
toxpython: 'python3.11'
68-
python_arch: 'arm64'
61+
python_arch: 'arm64' # Correct architecture for macos-latest
6962
tox_env: 'py311'
7063
os: 'macos-latest'
7164
- name: 'py311 (windows)'
7265
python: '3.11'
73-
toxpython: 'python3.11'
7466
python_arch: 'x64'
7567
tox_env: 'py311'
7668
os: 'windows-latest'
77-
7869
# - name: 'pypy38 (ubuntu)'
7970
# python: 'pypy-3.8'
8071
# toxpython: 'pypy3.8'
@@ -104,21 +95,26 @@ jobs:
10495
- uses: actions/checkout@v4
10596
with:
10697
fetch-depth: 0
107-
- uses: actions/setup-python@v5
98+
99+
- name: Set up Python
100+
uses: actions/setup-python@v5
101+
id: setup
108102
with:
109103
python-version: ${{ matrix.python }}
110104
architecture: ${{ matrix.python_arch }}
105+
111106
- name: install dependencies
112107
run: |
113-
python -mpip install --upgrade pip
114-
python -mpip install --progress-bar=off -r ci/requirements.txt
108+
${{ steps.setup.outputs.python-path }} -mpip install --upgrade pip
109+
${{ steps.setup.outputs.python-path }} -mpip install --progress-bar=off -r ci/requirements.txt
115110
virtualenv --version
116111
pip --version
117112
tox --version
118113
pip list --format=freeze
114+
119115
- name: test
120116
env:
121-
TOXPYTHON: '${{ matrix.toxpython }}'
117+
TOXPYTHON: ${{ steps.setup.outputs.python-path }}
122118
run: >
123119
tox -e ${{ matrix.tox_env }} -v
124120
@@ -132,20 +128,22 @@ jobs:
132128
with:
133129
fetch-depth: 0
134130
- uses: actions/setup-python@v5
131+
id: setup
135132
with:
136133
python-version: '3.11'
137134
architecture: 'x64'
138135
- name: install dependencies
139136
run: |
140-
python -mpip install --upgrade pip
141-
python -mpip install --progress-bar=off -r ci/requirements.txt
137+
${{ steps.setup.outputs.python-path }} -mpip install --upgrade pip
138+
${{ steps.setup.outputs.python-path }} -mpip install --progress-bar=off -r ci/requirements.txt
142139
virtualenv --version
143140
pip --version
144141
tox --version
145142
pip list --format=freeze
146143
- name: generate coverage report
147144
env:
148145
TOXPYTHON: '3.11'
146+
# TOXPYTHON: ${{ steps.setup.outputs.python-path }}
149147
run: |
150148
tox -e py311
151149
@@ -166,13 +164,14 @@ jobs:
166164
with:
167165
fetch-depth: 0
168166
- uses: actions/setup-python@v5
167+
id: setup
169168
with:
170169
python-version: '3.11'
171170
architecture: 'x64'
172171
- name: install dependencies
173172
run: |
174-
python -mpip install --upgrade pip
175-
python -mpip install --progress-bar=off -r ci/requirements.txt
173+
${{ steps.setup.outputs.python-path }} -mpip install --upgrade pip
174+
${{ steps.setup.outputs.python-path }} -mpip install --progress-bar=off -r ci/requirements.txt
176175
virtualenv --version
177176
pip --version
178177
tox --version
@@ -181,6 +180,7 @@ jobs:
181180
- name: generate docs
182181
env:
183182
TOXPYTHON: '3.11'
183+
# TOXPYTHON: ${{ steps.setup.outputs.python-path }}
184184
run: |
185185
tox -e docs -v
186186
ls -l dist/docs

ci/templates/.github/workflows/github-actions.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
] %}
3737
- name: '{{ env }} ({{ os }})'
3838
python: '{{ python }}'
39-
toxpython: '{{ toxpython }}'
4039
python_arch: '{{ python_arch }}'
4140
tox_env: '{{ env }}'
4241
os: '{{ os }}-latest'

0 commit comments

Comments
 (0)