Skip to content

Commit 7b69442

Browse files
committed
Specify versions that we can build wheel_dep with
1 parent 1204101 commit 7b69442

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

build/templates/tox-system_tests.ini.mako

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
driver_name = config['driver_name']
1010
if config['uses_nitclk'] or module_name == 'nitclk':
1111
wheel_env_no_py = '{}-wheel_dep'.format(module_name)
12-
wheel_env = 'py3-' + wheel_env_no_py + ','
12+
# We only actually need to build it once, but we specify multiple versions here
13+
# to prevent tox from trying to build the wheel with an unsupported (earlier) Python version
14+
wheel_env = 'py{39,310,311,312}-' + wheel_env_no_py + ','
1315
uses_other_wheel = True
1416
if module_name == 'nitclk':
1517
# nitclk system tests use niscope

generated/nidigital/tox-system_tests.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# test suite on all supported python versions. To use it, "pip install tox"
44
# and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nidigital)
55
[tox]
6-
envlist = py3-nidigital-wheel_dep,py{39,310,311,312}-nidigital-system_tests, py312-nidigital-coverage
6+
envlist = py{39,310,311,312}-nidigital-wheel_dep,py{39,310,311,312}-nidigital-system_tests, py312-nidigital-coverage
77
skip_missing_interpreters=True
88
ignore_basepython_conflict=True
99
# We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo
@@ -51,7 +51,7 @@ deps =
5151

5252
depends =
5353
nidigital-coverage: py{39,310,311,312}-nidigital-system_tests
54-
nidigital-system_tests: py3-nidigital-wheel_dep,
54+
nidigital-system_tests: py{39,310,311,312}-nidigital-wheel_dep,
5555

5656
passenv =
5757
GIT_BRANCH

generated/nifake/tox-system_tests.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# test suite on all supported python versions. To use it, "pip install tox"
44
# and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nifake)
55
[tox]
6-
envlist = py3-nifake-wheel_dep,py{39,310,311,312}-nifake-system_tests, py312-nifake-coverage
6+
envlist = py{39,310,311,312}-nifake-wheel_dep,py{39,310,311,312}-nifake-system_tests, py312-nifake-coverage
77
skip_missing_interpreters=True
88
ignore_basepython_conflict=True
99
# We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo
@@ -51,7 +51,7 @@ deps =
5151

5252
depends =
5353
nifake-coverage: py{39,310,311,312}-nifake-system_tests
54-
nifake-system_tests: py3-nifake-wheel_dep,
54+
nifake-system_tests: py{39,310,311,312}-nifake-wheel_dep,
5555

5656
passenv =
5757
GIT_BRANCH

generated/nifgen/tox-system_tests.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# test suite on all supported python versions. To use it, "pip install tox"
44
# and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nifgen)
55
[tox]
6-
envlist = py3-nifgen-wheel_dep,py{39,310,311,312}-nifgen-system_tests, py312-nifgen-coverage
6+
envlist = py{39,310,311,312}-nifgen-wheel_dep,py{39,310,311,312}-nifgen-system_tests, py312-nifgen-coverage
77
skip_missing_interpreters=True
88
ignore_basepython_conflict=True
99
# We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo
@@ -51,7 +51,7 @@ deps =
5151

5252
depends =
5353
nifgen-coverage: py{39,310,311,312}-nifgen-system_tests
54-
nifgen-system_tests: py3-nifgen-wheel_dep,
54+
nifgen-system_tests: py{39,310,311,312}-nifgen-wheel_dep,
5555

5656
passenv =
5757
GIT_BRANCH

generated/niscope/tox-system_tests.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# test suite on all supported python versions. To use it, "pip install tox"
44
# and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/niscope)
55
[tox]
6-
envlist = py3-niscope-wheel_dep,py{39,310,311,312}-niscope-system_tests, py312-niscope-coverage
6+
envlist = py{39,310,311,312}-niscope-wheel_dep,py{39,310,311,312}-niscope-system_tests, py312-niscope-coverage
77
skip_missing_interpreters=True
88
ignore_basepython_conflict=True
99
# We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo
@@ -51,7 +51,7 @@ deps =
5151

5252
depends =
5353
niscope-coverage: py{39,310,311,312}-niscope-system_tests
54-
niscope-system_tests: py3-niscope-wheel_dep,
54+
niscope-system_tests: py{39,310,311,312}-niscope-wheel_dep,
5555

5656
passenv =
5757
GIT_BRANCH

generated/nitclk/tox-system_tests.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# test suite on all supported python versions. To use it, "pip install tox"
44
# and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nitclk)
55
[tox]
6-
envlist = py3-nitclk-wheel_dep,py{39,310,311,312}-nitclk-system_tests, py312-nitclk-coverage
6+
envlist = py{39,310,311,312}-nitclk-wheel_dep,py{39,310,311,312}-nitclk-system_tests, py312-nitclk-coverage
77
skip_missing_interpreters=True
88
ignore_basepython_conflict=True
99
# We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo
@@ -50,7 +50,7 @@ deps =
5050

5151
depends =
5252
nitclk-coverage: py{39,310,311,312}-nitclk-system_tests
53-
nitclk-system_tests: py3-nitclk-wheel_dep,
53+
nitclk-system_tests: py{39,310,311,312}-nitclk-wheel_dep,
5454

5555
passenv =
5656
GIT_BRANCH

0 commit comments

Comments
 (0)