From ad5f652b62a7ad27b254341077505e8fd476daea Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Fri, 30 Oct 2026 10:32:07 -0500 Subject: [PATCH] Cap the version of pytest that we use. --- .github/actions/run_examples_using_pypi_uploads/action.yml | 2 +- build/templates/tox-system_tests.ini.mako | 2 +- generated/nidcpower/tox-system_tests.ini | 2 +- generated/nidigital/tox-system_tests.ini | 2 +- generated/nidmm/tox-system_tests.ini | 2 +- generated/nifake/tox-system_tests.ini | 2 +- generated/nifgen/tox-system_tests.ini | 2 +- generated/nimodinst/tox-system_tests.ini | 2 +- generated/nirfsa/tox-system_tests.ini | 2 +- generated/nirfsg/tox-system_tests.ini | 2 +- generated/niscope/tox-system_tests.ini | 2 +- generated/nise/tox-system_tests.ini | 2 +- generated/niswitch/tox-system_tests.ini | 2 +- generated/nitclk/tox-system_tests.ini | 2 +- tox.ini | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/actions/run_examples_using_pypi_uploads/action.yml b/.github/actions/run_examples_using_pypi_uploads/action.yml index 9fcbef494d..c76d57a59f 100644 --- a/.github/actions/run_examples_using_pypi_uploads/action.yml +++ b/.github/actions/run_examples_using_pypi_uploads/action.yml @@ -19,7 +19,7 @@ runs: shell: powershell - run: | .venv\Scripts\Activate.ps1 - python -m pip install ${{ inputs.module_name }}==${{ inputs.module_version }} pytest + python -m pip install ${{ inputs.module_name }}==${{ inputs.module_version }} "pytest<9.2.0" shell: powershell - if: ${{ inputs.module_name == 'nitclk' }} run: | diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index c2b3d9131d..d38d1d9a5f 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -77,7 +77,7 @@ deps = % if module_name == 'nidigital': ${module_name}-system_tests: nisync % endif - ${module_name}-system_tests: pytest + ${module_name}-system_tests: pytest < 9.2.0 ${module_name}-system_tests: coverage ${module_name}-system_tests: numpy ${module_name}-system_tests: hightime diff --git a/generated/nidcpower/tox-system_tests.ini b/generated/nidcpower/tox-system_tests.ini index e0e466998b..df9b8bf768 100644 --- a/generated/nidcpower/tox-system_tests.ini +++ b/generated/nidcpower/tox-system_tests.ini @@ -32,7 +32,7 @@ commands = nidcpower-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc deps = - nidcpower-system_tests: pytest + nidcpower-system_tests: pytest < 9.2.0 nidcpower-system_tests: coverage nidcpower-system_tests: numpy nidcpower-system_tests: hightime diff --git a/generated/nidigital/tox-system_tests.ini b/generated/nidigital/tox-system_tests.ini index 44541b14c7..6d4b4e2fe5 100644 --- a/generated/nidigital/tox-system_tests.ini +++ b/generated/nidigital/tox-system_tests.ini @@ -40,7 +40,7 @@ deps = nidigital-wheel_dep: build nidigital-system_tests: nisync - nidigital-system_tests: pytest + nidigital-system_tests: pytest < 9.2.0 nidigital-system_tests: coverage nidigital-system_tests: numpy nidigital-system_tests: hightime diff --git a/generated/nidmm/tox-system_tests.ini b/generated/nidmm/tox-system_tests.ini index 7d155899ac..64eb90b7df 100644 --- a/generated/nidmm/tox-system_tests.ini +++ b/generated/nidmm/tox-system_tests.ini @@ -32,7 +32,7 @@ commands = nidmm-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc deps = - nidmm-system_tests: pytest + nidmm-system_tests: pytest < 9.2.0 nidmm-system_tests: coverage nidmm-system_tests: numpy nidmm-system_tests: hightime diff --git a/generated/nifake/tox-system_tests.ini b/generated/nifake/tox-system_tests.ini index f6cb55df65..d43bd532f3 100644 --- a/generated/nifake/tox-system_tests.ini +++ b/generated/nifake/tox-system_tests.ini @@ -39,7 +39,7 @@ commands = deps = nifake-wheel_dep: build - nifake-system_tests: pytest + nifake-system_tests: pytest < 9.2.0 nifake-system_tests: coverage nifake-system_tests: numpy nifake-system_tests: hightime diff --git a/generated/nifgen/tox-system_tests.ini b/generated/nifgen/tox-system_tests.ini index 3445883a2a..a8f30cabca 100644 --- a/generated/nifgen/tox-system_tests.ini +++ b/generated/nifgen/tox-system_tests.ini @@ -39,7 +39,7 @@ commands = deps = nifgen-wheel_dep: build - nifgen-system_tests: pytest + nifgen-system_tests: pytest < 9.2.0 nifgen-system_tests: coverage nifgen-system_tests: numpy nifgen-system_tests: hightime diff --git a/generated/nimodinst/tox-system_tests.ini b/generated/nimodinst/tox-system_tests.ini index 6ab4054491..aa76201adc 100644 --- a/generated/nimodinst/tox-system_tests.ini +++ b/generated/nimodinst/tox-system_tests.ini @@ -32,7 +32,7 @@ commands = nimodinst-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc deps = - nimodinst-system_tests: pytest + nimodinst-system_tests: pytest < 9.2.0 nimodinst-system_tests: coverage nimodinst-system_tests: numpy nimodinst-system_tests: hightime diff --git a/generated/nirfsa/tox-system_tests.ini b/generated/nirfsa/tox-system_tests.ini index e93770db96..2a0026216f 100644 --- a/generated/nirfsa/tox-system_tests.ini +++ b/generated/nirfsa/tox-system_tests.ini @@ -39,7 +39,7 @@ commands = deps = nirfsa-wheel_dep: build - nirfsa-system_tests: pytest + nirfsa-system_tests: pytest < 9.2.0 nirfsa-system_tests: coverage nirfsa-system_tests: numpy nirfsa-system_tests: hightime diff --git a/generated/nirfsg/tox-system_tests.ini b/generated/nirfsg/tox-system_tests.ini index 2d5c32524a..da07dae76d 100644 --- a/generated/nirfsg/tox-system_tests.ini +++ b/generated/nirfsg/tox-system_tests.ini @@ -39,7 +39,7 @@ commands = deps = nirfsg-wheel_dep: build - nirfsg-system_tests: pytest + nirfsg-system_tests: pytest < 9.2.0 nirfsg-system_tests: coverage nirfsg-system_tests: numpy nirfsg-system_tests: hightime diff --git a/generated/niscope/tox-system_tests.ini b/generated/niscope/tox-system_tests.ini index 2f232d27ab..f8f941d994 100644 --- a/generated/niscope/tox-system_tests.ini +++ b/generated/niscope/tox-system_tests.ini @@ -39,7 +39,7 @@ commands = deps = niscope-wheel_dep: build - niscope-system_tests: pytest + niscope-system_tests: pytest < 9.2.0 niscope-system_tests: coverage niscope-system_tests: numpy niscope-system_tests: hightime diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 24128f4870..e09cc508d1 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -32,7 +32,7 @@ commands = nise-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc deps = - nise-system_tests: pytest + nise-system_tests: pytest < 9.2.0 nise-system_tests: coverage nise-system_tests: numpy nise-system_tests: hightime diff --git a/generated/niswitch/tox-system_tests.ini b/generated/niswitch/tox-system_tests.ini index fba12360ae..5c90eabb5e 100644 --- a/generated/niswitch/tox-system_tests.ini +++ b/generated/niswitch/tox-system_tests.ini @@ -32,7 +32,7 @@ commands = niswitch-coverage: coverage report --rcfile=../../tools/coverage_system_tests.rc deps = - niswitch-system_tests: pytest + niswitch-system_tests: pytest < 9.2.0 niswitch-system_tests: coverage niswitch-system_tests: numpy niswitch-system_tests: hightime diff --git a/generated/nitclk/tox-system_tests.ini b/generated/nitclk/tox-system_tests.ini index 26503d6ff4..821b25e8dd 100644 --- a/generated/nitclk/tox-system_tests.ini +++ b/generated/nitclk/tox-system_tests.ini @@ -39,7 +39,7 @@ commands = deps = nitclk-wheel_dep: build - nitclk-system_tests: pytest + nitclk-system_tests: pytest < 9.2.0 nitclk-system_tests: coverage nitclk-system_tests: numpy nitclk-system_tests: hightime diff --git a/tox.ini b/tox.ini index b42df19fdd..8369db4a84 100644 --- a/tox.ini +++ b/tox.ini @@ -141,7 +141,7 @@ commands = # pkg: check-manifest --ignore tox.ini,tests*,.github,.github/*,CONTRIBUTING.rst,docs,docs/* deps = - test: pytest + test: pytest < 9.2.0 test: pytest-timeout test: coverage test: mako @@ -151,7 +151,7 @@ deps = test: protobuf == 5.27.2 # Compatible with Python 3.14; should be backwards compatible with grpcio-tools 1.59.0 test: ni.grpcdevice.v1.proto >= 1.0.0 # Provides session_pb2 package at runtime since we no longer generate it per-driver test: nitlsconfig >= 1.0.0a2 - build_test: pytest + build_test: pytest < 9.2.0 build_test: coverage build_test: mako build_test: hacking