Skip to content

Commit 979240d

Browse files
committed
Remove most of the toxpython overrides (seems unnecessary).
1 parent 6e2476d commit 979240d

File tree

2 files changed

+4
-18
lines changed

2 files changed

+4
-18
lines changed

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
matrix:
1111
include:
1212
- name: 'check'
13-
python: '3.11'
14-
toxpython: 'python3.11'
13+
python: '3.13'
14+
toxpython: 'python3.13'
1515
tox_env: 'check'
1616
os: 'ubuntu-latest'
1717
- name: 'docs'
18-
python: '3.11'
19-
toxpython: 'python3.11'
18+
python: '3.13'
19+
toxpython: 'python3.13'
2020
tox_env: 'docs'
2121
os: 'ubuntu-latest'
2222
{% for env in tox_environments %}
@@ -25,11 +25,9 @@ jobs:
2525
{% if prefix.startswith('pypy') %}
2626
{% set python %}pypy-{{ prefix[4] }}.{{ prefix[5:] }}{% endset %}
2727
{% set cpython %}pp{{ prefix[4:5] }}{% endset %}
28-
{% set toxpython %}pypy{{ prefix[4] }}.{{ prefix[5:] }}{% endset %}
2928
{% else %}
3029
{% set python %}{{ prefix[2] }}.{{ prefix[3:].rstrip('t') }}{% endset %}
3130
{% set cpython %}cp{{ prefix[2:] }}{% endset %}
32-
{% set toxpython %}python{{ prefix[2] }}.{{ prefix[3:] }}{% endset %}
3331
{% endif %}
3432
{% for os, python_arch, cibw_arch, wheel_arch, include_cover in [
3533
['ubuntu', 'x64', 'x86_64', '*manylinux*', True],
@@ -46,7 +44,6 @@ jobs:
4644
- name: '{{ env }} ({{ os }}/{{ cibw_arch }}{{ name_suffix }})'
4745
artifact: '{{ env.rsplit('-', 1)[0] }}-{{ os }}-{{ cibw_arch }}{{ name_suffix.replace('/', '-') }}'
4846
python: '{{ python }}'
49-
toxpython: '{{ toxpython }}'
5047
python_arch: '{{ python_arch }}{% if freethreaded %}-freethreaded{% endif %}'
5148
tox_env: '{{ env }}'
5249
{% if 'cover' in env %}
@@ -92,7 +89,6 @@ jobs:
9289
if: matrix.cibw_build
9390
run: cibuildwheel
9491
env:
95-
TOXPYTHON: '{{ '${{ matrix.toxpython }}' }}'
9692
CIBW_ARCHS: '{{ '${{ matrix.cibw_arch }}' }}'
9793
CIBW_BUILD: '{{ '${{ matrix.cibw_build }}' }}'
9894
CIBW_FREE_THREADED_SUPPORT: '{{ '${{ matrix.cibw_ft }}' }}'
@@ -109,8 +105,6 @@ jobs:
109105
cd /d {project} &&
110106
tox --skip-pkg-install --direct-yolo -e {{ '${{ matrix.tox_env }}' }} -v
111107
- name: regular build and test
112-
env:
113-
TOXPYTHON: '{{ '${{ matrix.toxpython }}' }}'
114108
if: >
115109
!matrix.cibw_build
116110
run: >

tox.ini

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,6 @@ ignore_basepython_conflict = true
2121

2222
[testenv]
2323
basepython =
24-
pypy39: {env:TOXPYTHON:pypy3.9}
25-
pypy310: {env:TOXPYTHON:pypy3.10}
26-
py39: {env:TOXPYTHON:python3.9}
27-
py310: {env:TOXPYTHON:python3.10}
28-
py311: {env:TOXPYTHON:python3.11}
29-
py312: {env:TOXPYTHON:python3.12}
30-
py313: {env:TOXPYTHON:python3.13}
31-
py313t: {env:TOXPYTHON:python3.13t}
3224
{bootstrap,clean,check,report,docs,codecov}: {env:TOXPYTHON:python3}
3325
setenv =
3426
PYTHONPATH={toxinidir}/tests

0 commit comments

Comments
 (0)