From 12219eb861b24c1f606206a95e4ab3aa3b876318 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Sat, 25 Jan 2025 09:39:09 -0600 Subject: [PATCH 1/5] Drop Python 3.8 support - source changes --- .travis.yml | 1 - build/templates/setup.py.mako | 1 - build/templates/tox-system_tests.ini.mako | 4 ++-- tox-travis.ini | 4 ++-- tox.ini | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 436352a90..39a66604f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ matrix: # We run tests on the latest supported version of Python first. # This is where additional tests are run so we give it more time. - python: "3.12" - - python: "3.8" - python: "3.9" - python: "3.10" - python: "3.11" diff --git a/build/templates/setup.py.mako b/build/templates/setup.py.mako index 5885fd1b6..f78c0f5cf 100644 --- a/build/templates/setup.py.mako +++ b/build/templates/setup.py.mako @@ -73,7 +73,6 @@ setup( "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 4d7d59031..1980e5592 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -26,7 +26,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/${module_name}) [tox] -envlist = ${wheel_env}py{38,39,310,311,312}-${module_name}-system_tests, py312-${module_name}-coverage +envlist = ${wheel_env}py{39,310,311,312}-${module_name}-system_tests, py312-${module_name}-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo @@ -85,7 +85,7 @@ deps = ${module_name}-coverage: coverage depends = - ${module_name}-coverage: py{38,39,310,311,312}-${module_name}-system_tests + ${module_name}-coverage: py{39,310,311,312}-${module_name}-system_tests % if uses_other_wheel: ${module_name}-system_tests: ${wheel_env} % endif diff --git a/tox-travis.ini b/tox-travis.ini index 2a118521f..8e3311b39 100644 --- a/tox-travis.ini +++ b/tox-travis.ini @@ -7,9 +7,9 @@ # tox-travis.ini will have pyXX-clean and all pyXX-installers in the default envlist, while the developer tox.ini # does not have clean and only has one pyXX-installers # Uncomment this line for tox.ini -# envlist = py312-build_test,py312-codegen,py312-installers,py{38,39,310,311,312}-test,py312-flake8,py312-docs,py312-pkg +# envlist = py312-build_test,py312-codegen,py312-installers,py{39,310,311,312}-test,py312-flake8,py312-docs,py312-pkg # Uncomment this line for tox-travis.ini -envlist = py312-clean,py312-build_test,py312-codegen,py{38,39,310,311,312}-installers,py{38,39,310,311,312}-test,py312-flake8,py312-docs,py312-pkg +envlist = py312-clean,py312-build_test,py312-codegen,py{39,310,311,312}-installers,py{39,310,311,312}-test,py312-flake8,py312-docs,py312-pkg skip_missing_interpreters=True ignore_basepython_conflict=True skipsdist = true diff --git a/tox.ini b/tox.ini index 5a3ff038d..a7cd94b32 100644 --- a/tox.ini +++ b/tox.ini @@ -7,9 +7,9 @@ # tox-travis.ini will have pyXX-clean and all pyXX-installers in the default envlist, while the developer tox.ini # does not have clean and only has one pyXX-installers # Uncomment this line for tox.ini -envlist = py312-build_test,py312-codegen,py312-installers,py{38,39,310,311,312}-test,py312-flake8,py312-docs,py312-pkg +envlist = py312-build_test,py312-codegen,py312-installers,py{39,310,311,312}-test,py312-flake8,py312-docs,py312-pkg # Uncomment this line for tox-travis.ini -# envlist = py312-clean,py312-build_test,py312-codegen,py{38,39,310,311,312}-installers,py{38,39,310,311,312}-test,py312-flake8,py312-docs,py312-pkg +# envlist = py312-clean,py312-build_test,py312-codegen,py{39,310,311,312}-installers,py{39,310,311,312}-test,py312-flake8,py312-docs,py312-pkg skip_missing_interpreters=True ignore_basepython_conflict=True skipsdist = true From bbcd3f2f777b677ea80a243dd3501043581658d7 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Sat, 25 Jan 2025 09:49:52 -0600 Subject: [PATCH 2/5] tox -e codegen --- generated/nidcpower/setup.py | 1 - generated/nidcpower/tox-system_tests.ini | 4 ++-- generated/nidigital/setup.py | 1 - generated/nidigital/tox-system_tests.ini | 4 ++-- generated/nidmm/setup.py | 1 - generated/nidmm/tox-system_tests.ini | 4 ++-- generated/nifake/setup.py | 1 - generated/nifake/tox-system_tests.ini | 4 ++-- generated/nifgen/setup.py | 1 - generated/nifgen/tox-system_tests.ini | 4 ++-- generated/nimodinst/setup.py | 1 - generated/nimodinst/tox-system_tests.ini | 4 ++-- generated/niscope/setup.py | 1 - generated/niscope/tox-system_tests.ini | 4 ++-- generated/nise/setup.py | 1 - generated/nise/tox-system_tests.ini | 4 ++-- generated/niswitch/setup.py | 1 - generated/niswitch/tox-system_tests.ini | 4 ++-- generated/nitclk/setup.py | 1 - generated/nitclk/tox-system_tests.ini | 4 ++-- 20 files changed, 20 insertions(+), 30 deletions(-) diff --git a/generated/nidcpower/setup.py b/generated/nidcpower/setup.py index 496c809e3..e9d437e48 100644 --- a/generated/nidcpower/setup.py +++ b/generated/nidcpower/setup.py @@ -62,7 +62,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini index a4e98e067..a10b36735 100644 --- a/generated/nidcpower/tox-system_tests.ini +++ b/generated/nidcpower/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nidcpower) [tox] -envlist = py{38,39,310,311,312}-nidcpower-system_tests, py312-nidcpower-coverage +envlist = py{39,310,311,312}-nidcpower-system_tests, py312-nidcpower-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo @@ -43,7 +43,7 @@ deps = nidcpower-coverage: coverage depends = - nidcpower-coverage: py{38,39,310,311,312}-nidcpower-system_tests + nidcpower-coverage: py{39,310,311,312}-nidcpower-system_tests passenv = GIT_BRANCH diff --git a/generated/nidigital/setup.py b/generated/nidigital/setup.py index ed7b031ec..d8153f356 100644 --- a/generated/nidigital/setup.py +++ b/generated/nidigital/setup.py @@ -63,7 +63,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index 55e0565f4..85d7d6121 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nidigital) [tox] -envlist = py3-nidigital-wheel_dep,py{38,39,310,311,312}-nidigital-system_tests, py312-nidigital-coverage +envlist = py3-nidigital-wheel_dep,py{39,310,311,312}-nidigital-system_tests, py312-nidigital-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = nidigital-coverage: coverage depends = - nidigital-coverage: py{38,39,310,311,312}-nidigital-system_tests + nidigital-coverage: py{39,310,311,312}-nidigital-system_tests nidigital-system_tests: py3-nidigital-wheel_dep, passenv = diff --git a/generated/nidmm/setup.py b/generated/nidmm/setup.py index 44eb7624f..9e6321a25 100644 --- a/generated/nidmm/setup.py +++ b/generated/nidmm/setup.py @@ -62,7 +62,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini index b66e4f36e..3a3f88b93 100644 --- a/generated/nidmm/tox-system_tests.ini +++ b/generated/nidmm/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nidmm) [tox] -envlist = py{38,39,310,311,312}-nidmm-system_tests, py312-nidmm-coverage +envlist = py{39,310,311,312}-nidmm-system_tests, py312-nidmm-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo @@ -43,7 +43,7 @@ deps = nidmm-coverage: coverage depends = - nidmm-coverage: py{38,39,310,311,312}-nidmm-system_tests + nidmm-coverage: py{39,310,311,312}-nidmm-system_tests passenv = GIT_BRANCH diff --git a/generated/nifake/setup.py b/generated/nifake/setup.py index 3d0cd34c1..52086cd8e 100644 --- a/generated/nifake/setup.py +++ b/generated/nifake/setup.py @@ -63,7 +63,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index bcc340901..df9bc80f9 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nifake) [tox] -envlist = py3-nifake-wheel_dep,py{38,39,310,311,312}-nifake-system_tests, py312-nifake-coverage +envlist = py3-nifake-wheel_dep,py{39,310,311,312}-nifake-system_tests, py312-nifake-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = nifake-coverage: coverage depends = - nifake-coverage: py{38,39,310,311,312}-nifake-system_tests + nifake-coverage: py{39,310,311,312}-nifake-system_tests nifake-system_tests: py3-nifake-wheel_dep, passenv = diff --git a/generated/nifgen/setup.py b/generated/nifgen/setup.py index d743ce1bc..c176c5702 100644 --- a/generated/nifgen/setup.py +++ b/generated/nifgen/setup.py @@ -63,7 +63,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index cd91aca33..e93750faa 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nifgen) [tox] -envlist = py3-nifgen-wheel_dep,py{38,39,310,311,312}-nifgen-system_tests, py312-nifgen-coverage +envlist = py3-nifgen-wheel_dep,py{39,310,311,312}-nifgen-system_tests, py312-nifgen-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = nifgen-coverage: coverage depends = - nifgen-coverage: py{38,39,310,311,312}-nifgen-system_tests + nifgen-coverage: py{39,310,311,312}-nifgen-system_tests nifgen-system_tests: py3-nifgen-wheel_dep, passenv = diff --git a/generated/nimodinst/setup.py b/generated/nimodinst/setup.py index 98adb7fa8..1f6caf0de 100644 --- a/generated/nimodinst/setup.py +++ b/generated/nimodinst/setup.py @@ -56,7 +56,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini index 0713e2360..f48dcebea 100644 --- a/generated/nimodinst/tox-system_tests.ini +++ b/generated/nimodinst/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nimodinst) [tox] -envlist = py{38,39,310,311,312}-nimodinst-system_tests, py312-nimodinst-coverage +envlist = py{39,310,311,312}-nimodinst-system_tests, py312-nimodinst-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo @@ -42,7 +42,7 @@ deps = nimodinst-coverage: coverage depends = - nimodinst-coverage: py{38,39,310,311,312}-nimodinst-system_tests + nimodinst-coverage: py{39,310,311,312}-nimodinst-system_tests passenv = GIT_BRANCH diff --git a/generated/niscope/setup.py b/generated/niscope/setup.py index f213c48e1..82a0784d8 100644 --- a/generated/niscope/setup.py +++ b/generated/niscope/setup.py @@ -63,7 +63,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index 32a4999e5..dde865870 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/niscope) [tox] -envlist = py3-niscope-wheel_dep,py{38,39,310,311,312}-niscope-system_tests, py312-niscope-coverage +envlist = py3-niscope-wheel_dep,py{39,310,311,312}-niscope-system_tests, py312-niscope-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = niscope-coverage: coverage depends = - niscope-coverage: py{38,39,310,311,312}-niscope-system_tests + niscope-coverage: py{39,310,311,312}-niscope-system_tests niscope-system_tests: py3-niscope-wheel_dep, passenv = diff --git a/generated/nise/setup.py b/generated/nise/setup.py index 251e7a3f1..70c6a2272 100644 --- a/generated/nise/setup.py +++ b/generated/nise/setup.py @@ -56,7 +56,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 937c854fe..04fabd029 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nise) [tox] -envlist = py{38,39,310,311,312}-nise-system_tests, py312-nise-coverage +envlist = py{39,310,311,312}-nise-system_tests, py312-nise-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo @@ -42,7 +42,7 @@ deps = nise-coverage: coverage depends = - nise-coverage: py{38,39,310,311,312}-nise-system_tests + nise-coverage: py{39,310,311,312}-nise-system_tests passenv = GIT_BRANCH diff --git a/generated/niswitch/setup.py b/generated/niswitch/setup.py index e09dc8de1..b9823c667 100644 --- a/generated/niswitch/setup.py +++ b/generated/niswitch/setup.py @@ -62,7 +62,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini index 26cd26fda..e8c6f8afd 100644 --- a/generated/niswitch/tox-system_tests.ini +++ b/generated/niswitch/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/niswitch) [tox] -envlist = py{38,39,310,311,312}-niswitch-system_tests, py312-niswitch-coverage +envlist = py{39,310,311,312}-niswitch-system_tests, py312-niswitch-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo @@ -43,7 +43,7 @@ deps = niswitch-coverage: coverage depends = - niswitch-coverage: py{38,39,310,311,312}-niswitch-system_tests + niswitch-coverage: py{39,310,311,312}-niswitch-system_tests passenv = GIT_BRANCH diff --git a/generated/nitclk/setup.py b/generated/nitclk/setup.py index 8719085b1..2462d1d74 100644 --- a/generated/nitclk/setup.py +++ b/generated/nitclk/setup.py @@ -56,7 +56,6 @@ def read_contents(file_to_read): "Operating System :: Microsoft :: Windows", "Operating System :: POSIX", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index 82ea423a5..2fb45a788 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nitclk) [tox] -envlist = py3-nitclk-wheel_dep,py{38,39,310,311,312}-nitclk-system_tests, py312-nitclk-coverage +envlist = py3-nitclk-wheel_dep,py{39,310,311,312}-nitclk-system_tests, py312-nitclk-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # We put the .tox directory outside of the Jenkins workspace so that it isn't wiped with the rest of the repo @@ -49,7 +49,7 @@ deps = nitclk-coverage: coverage depends = - nitclk-coverage: py{38,39,310,311,312}-nitclk-system_tests + nitclk-coverage: py{39,310,311,312}-nitclk-system_tests nitclk-system_tests: py3-nitclk-wheel_dep, passenv = From 922f0755f370d4e3b9220839f66b93481edcd7dc Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Sat, 25 Jan 2025 09:50:11 -0600 Subject: [PATCH 3/5] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10acff81d..448ad58a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,7 @@ All notable changes to this project will be documented in this file. * #### Added * #### Changed * #### Removed + * Support for Python 3.8 * ### `nidcpower` (NI-DCPower) * #### Added * API parity with NI-DCPower 2025 Q1. From 1204101eda8b38a6547d7b566f59493ce22ad74d Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Mon, 27 Jan 2025 16:07:33 -0600 Subject: [PATCH 4/5] Enforce version support policy --- build/templates/setup.py.mako | 1 + generated/nidcpower/setup.py | 1 + generated/nidigital/setup.py | 1 + generated/nidmm/setup.py | 1 + generated/nifake/setup.py | 1 + generated/nifgen/setup.py | 1 + generated/nimodinst/setup.py | 1 + generated/niscope/setup.py | 1 + generated/nise/setup.py | 1 + generated/niswitch/setup.py | 1 + generated/nitclk/setup.py | 1 + 11 files changed, 11 insertions(+) diff --git a/build/templates/setup.py.mako b/build/templates/setup.py.mako index f78c0f5cf..83268a1c0 100644 --- a/build/templates/setup.py.mako +++ b/build/templates/setup.py.mako @@ -47,6 +47,7 @@ setup( license='MIT', include_package_data=True, packages=['${config['module_name']}'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', % if config['uses_nitclk']: diff --git a/generated/nidcpower/setup.py b/generated/nidcpower/setup.py index e9d437e48..5344d9f90 100644 --- a/generated/nidcpower/setup.py +++ b/generated/nidcpower/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['nidcpower'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', ], diff --git a/generated/nidigital/setup.py b/generated/nidigital/setup.py index d8153f356..f25ef41a4 100644 --- a/generated/nidigital/setup.py +++ b/generated/nidigital/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['nidigital'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', 'nitclk', diff --git a/generated/nidmm/setup.py b/generated/nidmm/setup.py index 9e6321a25..f175a5bf7 100644 --- a/generated/nidmm/setup.py +++ b/generated/nidmm/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['nidmm'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', ], diff --git a/generated/nifake/setup.py b/generated/nifake/setup.py index 52086cd8e..a864d685d 100644 --- a/generated/nifake/setup.py +++ b/generated/nifake/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['nifake'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', 'nitclk', diff --git a/generated/nifgen/setup.py b/generated/nifgen/setup.py index c176c5702..8a25c3312 100644 --- a/generated/nifgen/setup.py +++ b/generated/nifgen/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['nifgen'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', 'nitclk', diff --git a/generated/nimodinst/setup.py b/generated/nimodinst/setup.py index 1f6caf0de..06d405580 100644 --- a/generated/nimodinst/setup.py +++ b/generated/nimodinst/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['nimodinst'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', ], diff --git a/generated/niscope/setup.py b/generated/niscope/setup.py index 82a0784d8..75cb35f99 100644 --- a/generated/niscope/setup.py +++ b/generated/niscope/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['niscope'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', 'nitclk', diff --git a/generated/nise/setup.py b/generated/nise/setup.py index 70c6a2272..211be5dfc 100644 --- a/generated/nise/setup.py +++ b/generated/nise/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['nise'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', ], diff --git a/generated/niswitch/setup.py b/generated/niswitch/setup.py index b9823c667..0482cfa92 100644 --- a/generated/niswitch/setup.py +++ b/generated/niswitch/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['niswitch'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', ], diff --git a/generated/nitclk/setup.py b/generated/nitclk/setup.py index 2462d1d74..7b3fc7652 100644 --- a/generated/nitclk/setup.py +++ b/generated/nitclk/setup.py @@ -41,6 +41,7 @@ def read_contents(file_to_read): license='MIT', include_package_data=True, packages=['nitclk'], + python_requires='>=3.9', install_requires=[ 'hightime>=0.2.0', ], From 7b694421303be41dc27094cfbca85d24bc0afb0d Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Tue, 28 Jan 2025 08:55:27 -0600 Subject: [PATCH 5/5] Specify versions that we can build wheel_dep with --- build/templates/tox-system_tests.ini.mako | 4 +++- generated/nidigital/tox-system_tests.ini | 4 ++-- generated/nifake/tox-system_tests.ini | 4 ++-- generated/nifgen/tox-system_tests.ini | 4 ++-- generated/niscope/tox-system_tests.ini | 4 ++-- generated/nitclk/tox-system_tests.ini | 4 ++-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 1980e5592..cd3f27d5a 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -9,7 +9,9 @@ driver_name = config['driver_name'] if config['uses_nitclk'] or module_name == 'nitclk': wheel_env_no_py = '{}-wheel_dep'.format(module_name) - wheel_env = 'py3-' + wheel_env_no_py + ',' + # We only actually need to build it once, but we specify multiple versions here + # to prevent tox from trying to build the wheel with an unsupported (earlier) Python version + wheel_env = 'py{39,310,311,312}-' + wheel_env_no_py + ',' uses_other_wheel = True if module_name == 'nitclk': # nitclk system tests use niscope diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index 85d7d6121..4bcef3a22 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nidigital) [tox] -envlist = py3-nidigital-wheel_dep,py{39,310,311,312}-nidigital-system_tests, py312-nidigital-coverage +envlist = py{39,310,311,312}-nidigital-wheel_dep,py{39,310,311,312}-nidigital-system_tests, py312-nidigital-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = depends = nidigital-coverage: py{39,310,311,312}-nidigital-system_tests - nidigital-system_tests: py3-nidigital-wheel_dep, + nidigital-system_tests: py{39,310,311,312}-nidigital-wheel_dep, passenv = GIT_BRANCH diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index df9bc80f9..b7be0467e 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nifake) [tox] -envlist = py3-nifake-wheel_dep,py{39,310,311,312}-nifake-system_tests, py312-nifake-coverage +envlist = py{39,310,311,312}-nifake-wheel_dep,py{39,310,311,312}-nifake-system_tests, py312-nifake-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = depends = nifake-coverage: py{39,310,311,312}-nifake-system_tests - nifake-system_tests: py3-nifake-wheel_dep, + nifake-system_tests: py{39,310,311,312}-nifake-wheel_dep, passenv = GIT_BRANCH diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index e93750faa..1572fbc08 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nifgen) [tox] -envlist = py3-nifgen-wheel_dep,py{39,310,311,312}-nifgen-system_tests, py312-nifgen-coverage +envlist = py{39,310,311,312}-nifgen-wheel_dep,py{39,310,311,312}-nifgen-system_tests, py312-nifgen-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = depends = nifgen-coverage: py{39,310,311,312}-nifgen-system_tests - nifgen-system_tests: py3-nifgen-wheel_dep, + nifgen-system_tests: py{39,310,311,312}-nifgen-wheel_dep, passenv = GIT_BRANCH diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index dde865870..a2a99de8e 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/niscope) [tox] -envlist = py3-niscope-wheel_dep,py{39,310,311,312}-niscope-system_tests, py312-niscope-coverage +envlist = py{39,310,311,312}-niscope-wheel_dep,py{39,310,311,312}-niscope-system_tests, py312-niscope-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = depends = niscope-coverage: py{39,310,311,312}-niscope-system_tests - niscope-system_tests: py3-niscope-wheel_dep, + niscope-system_tests: py{39,310,311,312}-niscope-wheel_dep, passenv = GIT_BRANCH diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index 2fb45a788..dd05deb4f 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -3,7 +3,7 @@ # test suite on all supported python versions. To use it, "pip install tox" # and then run "tox -c tox-system_tests.ini" from the driver directory. (generated/nitclk) [tox] -envlist = py3-nitclk-wheel_dep,py{39,310,311,312}-nitclk-system_tests, py312-nitclk-coverage +envlist = py{39,310,311,312}-nitclk-wheel_dep,py{39,310,311,312}-nitclk-system_tests, py312-nitclk-coverage skip_missing_interpreters=True ignore_basepython_conflict=True # 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 = depends = nitclk-coverage: py{39,310,311,312}-nitclk-system_tests - nitclk-system_tests: py3-nitclk-wheel_dep, + nitclk-system_tests: py{39,310,311,312}-nitclk-wheel_dep, passenv = GIT_BRANCH