From 5448e9cff0751e41864c15e3bd8c12cc8a900497 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:21:26 -0500 Subject: [PATCH 1/8] Update runtime versions tested against - '23.8' aka '2023 Q4' for most drivers - '24.3' aka '2024 Q2' for NI-DCPower, NI-Digital - These also update the versions for NI-ModInst and NI-TClk --- src/nidcpower/metadata/config_addon.py | 2 +- src/nidigital/metadata/config_addon.py | 2 +- src/nidmm/metadata/config_addon.py | 2 +- src/nifgen/metadata/config_addon.py | 2 +- src/nimodinst/metadata/config_addon.py | 2 +- src/niscope/metadata/config_addon.py | 2 +- src/nise/metadata/config_addon.py | 2 +- src/niswitch/metadata/config_addon.py | 2 +- src/nitclk/metadata/config_addon.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/nidcpower/metadata/config_addon.py b/src/nidcpower/metadata/config_addon.py index 12c5abae4..2c76e4347 100644 --- a/src/nidcpower/metadata/config_addon.py +++ b/src/nidcpower/metadata/config_addon.py @@ -1,6 +1,6 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q2', + 'latest_runtime_version_tested_against': '2024 Q2', 'initial_release_year': '2017', } diff --git a/src/nidigital/metadata/config_addon.py b/src/nidigital/metadata/config_addon.py index 82192e06d..df97b1cbb 100644 --- a/src/nidigital/metadata/config_addon.py +++ b/src/nidigital/metadata/config_addon.py @@ -1,7 +1,7 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q2', + 'latest_runtime_version_tested_against': '2024 Q2', 'initial_release_year': '2019', 'custom_types': [ { diff --git a/src/nidmm/metadata/config_addon.py b/src/nidmm/metadata/config_addon.py index 5a788fd56..4650560d3 100644 --- a/src/nidmm/metadata/config_addon.py +++ b/src/nidmm/metadata/config_addon.py @@ -1,6 +1,6 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q1.1', + 'latest_runtime_version_tested_against': '2023 Q4', 'initial_release_year': '2017', } diff --git a/src/nifgen/metadata/config_addon.py b/src/nifgen/metadata/config_addon.py index 5a788fd56..4650560d3 100644 --- a/src/nifgen/metadata/config_addon.py +++ b/src/nifgen/metadata/config_addon.py @@ -1,6 +1,6 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q1.1', + 'latest_runtime_version_tested_against': '2023 Q4', 'initial_release_year': '2017', } diff --git a/src/nimodinst/metadata/config_addon.py b/src/nimodinst/metadata/config_addon.py index 12c5abae4..2c76e4347 100644 --- a/src/nimodinst/metadata/config_addon.py +++ b/src/nimodinst/metadata/config_addon.py @@ -1,6 +1,6 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q2', + 'latest_runtime_version_tested_against': '2024 Q2', 'initial_release_year': '2017', } diff --git a/src/niscope/metadata/config_addon.py b/src/niscope/metadata/config_addon.py index 9bc8c68c6..156ea2933 100644 --- a/src/niscope/metadata/config_addon.py +++ b/src/niscope/metadata/config_addon.py @@ -1,7 +1,7 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q1.1', + 'latest_runtime_version_tested_against': '2023 Q4', 'initial_release_year': '2017', 'custom_types': [ # Redundant, since waveform_info is also in the base config.py file. See issue 1495 (https://github.com/ni/nimi-python/issues/1495) diff --git a/src/nise/metadata/config_addon.py b/src/nise/metadata/config_addon.py index dea16df51..70063c097 100644 --- a/src/nise/metadata/config_addon.py +++ b/src/nise/metadata/config_addon.py @@ -1,6 +1,6 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q1', + 'latest_runtime_version_tested_against': '2023 Q4', 'initial_release_year': '2018', } diff --git a/src/niswitch/metadata/config_addon.py b/src/niswitch/metadata/config_addon.py index d2dbebd2c..4650560d3 100644 --- a/src/niswitch/metadata/config_addon.py +++ b/src/niswitch/metadata/config_addon.py @@ -1,6 +1,6 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q1', + 'latest_runtime_version_tested_against': '2023 Q4', 'initial_release_year': '2017', } diff --git a/src/nitclk/metadata/config_addon.py b/src/nitclk/metadata/config_addon.py index a22d5eff9..adfc4d638 100644 --- a/src/nitclk/metadata/config_addon.py +++ b/src/nitclk/metadata/config_addon.py @@ -1,6 +1,6 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q2', + 'latest_runtime_version_tested_against': '2024 Q2', 'initial_release_year': '2019', } From 0cd478d9dd7548d3dc7ca1caf834626a846e6088 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:25:21 -0500 Subject: [PATCH 2/8] run `tox -e codegen` --- README.rst | 18 +++++++++--------- docs/nidcpower/status.inc | 2 +- docs/nidigital/status.inc | 2 +- docs/nidmm/status.inc | 2 +- docs/nifgen/status.inc | 2 +- docs/nimodinst/status.inc | 2 +- docs/niscope/status.inc | 2 +- docs/nise/status.inc | 2 +- docs/niswitch/status.inc | 2 +- docs/nitclk/status.inc | 2 +- generated/nidcpower/README.rst | 2 +- generated/nidigital/README.rst | 2 +- generated/nidmm/README.rst | 2 +- generated/nifgen/README.rst | 2 +- generated/nimodinst/README.rst | 2 +- generated/niscope/README.rst | 2 +- generated/nise/README.rst | 2 +- generated/niswitch/README.rst | 2 +- generated/nitclk/README.rst | 2 +- 19 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.rst b/README.rst index 5b44ce2fc..502c4d1fa 100644 --- a/README.rst +++ b/README.rst @@ -65,7 +65,7 @@ NI-DCPower Python API Status +-------------------------------+--------------------------+ | NI-DCPower (nidcpower) | | +===============================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+--------------------------+ | PyPI Version | |nidcpowerLatestVersion| | +-------------------------------+--------------------------+ @@ -111,7 +111,7 @@ NI-Digital Pattern Driver Python API Status +---------------------------------------+--------------------------+ | NI-Digital Pattern Driver (nidigital) | | +=======================================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +---------------------------------------+--------------------------+ | PyPI Version | |nidigitalLatestVersion| | +---------------------------------------+--------------------------+ @@ -157,7 +157,7 @@ NI-DMM Python API Status +-------------------------------+----------------------+ | NI-DMM (nidmm) | | +===============================+======================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+----------------------+ | PyPI Version | |nidmmLatestVersion| | +-------------------------------+----------------------+ @@ -203,7 +203,7 @@ NI-FGEN Python API Status +-------------------------------+-----------------------+ | NI-FGEN (nifgen) | | +===============================+=======================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+-----------------------+ | PyPI Version | |nifgenLatestVersion| | +-------------------------------+-----------------------+ @@ -249,7 +249,7 @@ NI-ModInst Python API Status +-------------------------------+--------------------------+ | NI-ModInst (nimodinst) | | +===============================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+--------------------------+ | PyPI Version | |nimodinstLatestVersion| | +-------------------------------+--------------------------+ @@ -295,7 +295,7 @@ NI-SCOPE Python API Status +-------------------------------+------------------------+ | NI-SCOPE (niscope) | | +===============================+========================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+------------------------+ | PyPI Version | |niscopeLatestVersion| | +-------------------------------+------------------------+ @@ -341,7 +341,7 @@ NI Switch Executive Python API Status +-------------------------------+---------------------+ | NI Switch Executive (nise) | | +===============================+=====================+ -| Driver Version Tested Against | 2023 Q1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+---------------------+ | PyPI Version | |niseLatestVersion| | +-------------------------------+---------------------+ @@ -387,7 +387,7 @@ NI-SWITCH Python API Status +-------------------------------+-------------------------+ | NI-SWITCH (niswitch) | | +===============================+=========================+ -| Driver Version Tested Against | 2023 Q1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+-------------------------+ | PyPI Version | |niswitchLatestVersion| | +-------------------------------+-------------------------+ @@ -433,7 +433,7 @@ NI-TClk Python API Status +-------------------------------+-----------------------+ | NI-TClk (nitclk) | | +===============================+=======================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+-----------------------+ | PyPI Version | |nitclkLatestVersion| | +-------------------------------+-----------------------+ diff --git a/docs/nidcpower/status.inc b/docs/nidcpower/status.inc index dd6736b7f..46f033102 100644 --- a/docs/nidcpower/status.inc +++ b/docs/nidcpower/status.inc @@ -5,7 +5,7 @@ NI-DCPower Python API Status +-------------------------------+--------------------------+ | NI-DCPower (nidcpower) | | +===============================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+--------------------------+ | PyPI Version | |nidcpowerLatestVersion| | +-------------------------------+--------------------------+ diff --git a/docs/nidigital/status.inc b/docs/nidigital/status.inc index 6580ac710..e73d5a9df 100644 --- a/docs/nidigital/status.inc +++ b/docs/nidigital/status.inc @@ -5,7 +5,7 @@ NI-Digital Pattern Driver Python API Status +---------------------------------------+--------------------------+ | NI-Digital Pattern Driver (nidigital) | | +=======================================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +---------------------------------------+--------------------------+ | PyPI Version | |nidigitalLatestVersion| | +---------------------------------------+--------------------------+ diff --git a/docs/nidmm/status.inc b/docs/nidmm/status.inc index 9a999423c..cebcff6d0 100644 --- a/docs/nidmm/status.inc +++ b/docs/nidmm/status.inc @@ -5,7 +5,7 @@ NI-DMM Python API Status +-------------------------------+----------------------+ | NI-DMM (nidmm) | | +===============================+======================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+----------------------+ | PyPI Version | |nidmmLatestVersion| | +-------------------------------+----------------------+ diff --git a/docs/nifgen/status.inc b/docs/nifgen/status.inc index 69587e886..b98f3350b 100644 --- a/docs/nifgen/status.inc +++ b/docs/nifgen/status.inc @@ -5,7 +5,7 @@ NI-FGEN Python API Status +-------------------------------+-----------------------+ | NI-FGEN (nifgen) | | +===============================+=======================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+-----------------------+ | PyPI Version | |nifgenLatestVersion| | +-------------------------------+-----------------------+ diff --git a/docs/nimodinst/status.inc b/docs/nimodinst/status.inc index 42dcd3a55..3d08fcbf9 100644 --- a/docs/nimodinst/status.inc +++ b/docs/nimodinst/status.inc @@ -5,7 +5,7 @@ NI-ModInst Python API Status +-------------------------------+--------------------------+ | NI-ModInst (nimodinst) | | +===============================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+--------------------------+ | PyPI Version | |nimodinstLatestVersion| | +-------------------------------+--------------------------+ diff --git a/docs/niscope/status.inc b/docs/niscope/status.inc index eec49dc37..1fcad90d0 100644 --- a/docs/niscope/status.inc +++ b/docs/niscope/status.inc @@ -5,7 +5,7 @@ NI-SCOPE Python API Status +-------------------------------+------------------------+ | NI-SCOPE (niscope) | | +===============================+========================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+------------------------+ | PyPI Version | |niscopeLatestVersion| | +-------------------------------+------------------------+ diff --git a/docs/nise/status.inc b/docs/nise/status.inc index 365f879ed..01f225c25 100644 --- a/docs/nise/status.inc +++ b/docs/nise/status.inc @@ -5,7 +5,7 @@ NI Switch Executive Python API Status +-------------------------------+---------------------+ | NI Switch Executive (nise) | | +===============================+=====================+ -| Driver Version Tested Against | 2023 Q1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+---------------------+ | PyPI Version | |niseLatestVersion| | +-------------------------------+---------------------+ diff --git a/docs/niswitch/status.inc b/docs/niswitch/status.inc index 809400606..806e525f5 100644 --- a/docs/niswitch/status.inc +++ b/docs/niswitch/status.inc @@ -5,7 +5,7 @@ NI-SWITCH Python API Status +-------------------------------+-------------------------+ | NI-SWITCH (niswitch) | | +===============================+=========================+ -| Driver Version Tested Against | 2023 Q1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+-------------------------+ | PyPI Version | |niswitchLatestVersion| | +-------------------------------+-------------------------+ diff --git a/docs/nitclk/status.inc b/docs/nitclk/status.inc index b2c93f8a9..933e08e31 100644 --- a/docs/nitclk/status.inc +++ b/docs/nitclk/status.inc @@ -5,7 +5,7 @@ NI-TClk Python API Status +-------------------------------+-----------------------+ | NI-TClk (nitclk) | | +===============================+=======================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+-----------------------+ | PyPI Version | |nitclkLatestVersion| | +-------------------------------+-----------------------+ diff --git a/generated/nidcpower/README.rst b/generated/nidcpower/README.rst index 7b89ca962..daa812bd5 100644 --- a/generated/nidcpower/README.rst +++ b/generated/nidcpower/README.rst @@ -53,7 +53,7 @@ NI-DCPower Python API Status +-------------------------------+--------------------------+ | NI-DCPower (nidcpower) | | +===============================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+--------------------------+ | PyPI Version | |nidcpowerLatestVersion| | +-------------------------------+--------------------------+ diff --git a/generated/nidigital/README.rst b/generated/nidigital/README.rst index 5be1034cb..b632c8a4e 100644 --- a/generated/nidigital/README.rst +++ b/generated/nidigital/README.rst @@ -53,7 +53,7 @@ NI-Digital Pattern Driver Python API Status +---------------------------------------+--------------------------+ | NI-Digital Pattern Driver (nidigital) | | +=======================================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +---------------------------------------+--------------------------+ | PyPI Version | |nidigitalLatestVersion| | +---------------------------------------+--------------------------+ diff --git a/generated/nidmm/README.rst b/generated/nidmm/README.rst index 9b32b301b..b18e9f9da 100644 --- a/generated/nidmm/README.rst +++ b/generated/nidmm/README.rst @@ -53,7 +53,7 @@ NI-DMM Python API Status +-------------------------------+----------------------+ | NI-DMM (nidmm) | | +===============================+======================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+----------------------+ | PyPI Version | |nidmmLatestVersion| | +-------------------------------+----------------------+ diff --git a/generated/nifgen/README.rst b/generated/nifgen/README.rst index ada14862d..a88f911b2 100644 --- a/generated/nifgen/README.rst +++ b/generated/nifgen/README.rst @@ -53,7 +53,7 @@ NI-FGEN Python API Status +-------------------------------+-----------------------+ | NI-FGEN (nifgen) | | +===============================+=======================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+-----------------------+ | PyPI Version | |nifgenLatestVersion| | +-------------------------------+-----------------------+ diff --git a/generated/nimodinst/README.rst b/generated/nimodinst/README.rst index a0dd242d6..908a248df 100644 --- a/generated/nimodinst/README.rst +++ b/generated/nimodinst/README.rst @@ -53,7 +53,7 @@ NI-ModInst Python API Status +-------------------------------+--------------------------+ | NI-ModInst (nimodinst) | | +===============================+==========================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+--------------------------+ | PyPI Version | |nimodinstLatestVersion| | +-------------------------------+--------------------------+ diff --git a/generated/niscope/README.rst b/generated/niscope/README.rst index f4b0f0772..d221b3d74 100644 --- a/generated/niscope/README.rst +++ b/generated/niscope/README.rst @@ -53,7 +53,7 @@ NI-SCOPE Python API Status +-------------------------------+------------------------+ | NI-SCOPE (niscope) | | +===============================+========================+ -| Driver Version Tested Against | 2023 Q1.1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+------------------------+ | PyPI Version | |niscopeLatestVersion| | +-------------------------------+------------------------+ diff --git a/generated/nise/README.rst b/generated/nise/README.rst index 36e7d0b90..03bf9986a 100644 --- a/generated/nise/README.rst +++ b/generated/nise/README.rst @@ -53,7 +53,7 @@ NI Switch Executive Python API Status +-------------------------------+---------------------+ | NI Switch Executive (nise) | | +===============================+=====================+ -| Driver Version Tested Against | 2023 Q1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+---------------------+ | PyPI Version | |niseLatestVersion| | +-------------------------------+---------------------+ diff --git a/generated/niswitch/README.rst b/generated/niswitch/README.rst index 5fa053b78..e0832295a 100644 --- a/generated/niswitch/README.rst +++ b/generated/niswitch/README.rst @@ -53,7 +53,7 @@ NI-SWITCH Python API Status +-------------------------------+-------------------------+ | NI-SWITCH (niswitch) | | +===============================+=========================+ -| Driver Version Tested Against | 2023 Q1 | +| Driver Version Tested Against | 2023 Q4 | +-------------------------------+-------------------------+ | PyPI Version | |niswitchLatestVersion| | +-------------------------------+-------------------------+ diff --git a/generated/nitclk/README.rst b/generated/nitclk/README.rst index 06c3e63d5..2eb1e6b21 100644 --- a/generated/nitclk/README.rst +++ b/generated/nitclk/README.rst @@ -53,7 +53,7 @@ NI-TClk Python API Status +-------------------------------+-----------------------+ | NI-TClk (nitclk) | | +===============================+=======================+ -| Driver Version Tested Against | 2023 Q2 | +| Driver Version Tested Against | 2024 Q2 | +-------------------------------+-----------------------+ | PyPI Version | |nitclkLatestVersion| | +-------------------------------+-----------------------+ From d5c1e9a0627e28dce54a7fcca359475f7355ca32 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:49:57 -0500 Subject: [PATCH 3/8] Stop skipping tests, now that we have simulation support for their features in the driver --- src/nidcpower/system_tests/test_system_nidcpower.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/nidcpower/system_tests/test_system_nidcpower.py b/src/nidcpower/system_tests/test_system_nidcpower.py index c4670573e..4b169f8ed 100644 --- a/src/nidcpower/system_tests/test_system_nidcpower.py +++ b/src/nidcpower/system_tests/test_system_nidcpower.py @@ -1027,7 +1027,6 @@ def test_perform_lcr_load_compensation(self, session): def test_perform_lcr_open_short_custom_cable_compensation(self, session, compensation_function): compensation_function(session) - @pytest.mark.skip(reason="TODO(jfitzger): Skip until we have a way to successfully call configure_lcr_custom_cable_compensation() with a simulated device. GitHub issue #1908") @pytest.mark.resource_name("4190/0") @pytest.mark.options("Simulate=1, DriverSetup=Model:4190; BoardType:PXIe") def test_lcr_custom_cable_compensation_data(self, session): @@ -1078,7 +1077,6 @@ class TestLibrary(SystemTests): def session_creation_kwargs(self): return {} - @pytest.mark.skip(reason="TODO(jfitzger): Skip until we have a way to successfully call configure_lcr_compensation() with a simulated device. GitHub issue #1908") @pytest.mark.resource_name("4190/0") @pytest.mark.options("Simulate=1, DriverSetup=Model:4190; BoardType:PXIe") def test_lcr_compensation_data(self, session): From 41bc4cbbfc170457dbc9c72ef4e48eab2a116a92 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Fri, 19 Apr 2024 11:05:03 -0500 Subject: [PATCH 4/8] Create SwitchExecutiveExample VD before running system tests --- build/templates/tox-system_tests.ini.mako | 9 +++++++++ generated/nise/tox-system_tests.ini | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index a8c6d982c..7a4565f35 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -33,6 +33,11 @@ ignore_basepython_conflict=True toxworkdir = ../../../.tox [testenv] +% if module_name == 'nise': +allowlist_externals = + C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe + +% endif description = % if uses_other_wheel: ${wheel_env_no_py}: Build the ${other_wheel} wheel because we use it in ${module_name} tests @@ -51,6 +56,10 @@ commands = % if uses_other_wheel: ${wheel_env_no_py}: python -m build --wheel +% endif +% if module_name == 'nise': + # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. + nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s % endif # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now ${module_name}-system_tests: python -m pip install --disable-pip-version-check --upgrade pip diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 1a7f41eaf..b20b86338 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -10,6 +10,9 @@ ignore_basepython_conflict=True toxworkdir = ../../../.tox [testenv] +allowlist_externals = + C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe + description = nise-system_tests: Run nise system tests (requires NI Switch Executive runtime to be installed) nise-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions @@ -19,6 +22,8 @@ changedir = nise-coverage: . commands = + # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. + nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now nise-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nise-system_tests: python -c "import nise; nise.print_diagnostic_information()" From 371a3998f7501014c87317d20975866fd1396f58 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:05:19 -0500 Subject: [PATCH 5/8] Try moving vd creation to commands_pre --- build/templates/tox-system_tests.ini.mako | 10 ++++++---- generated/nise/tox-system_tests.ini | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 7a4565f35..18a33913f 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -52,14 +52,16 @@ changedir = ${module_name}-system_tests: . ${module_name}-coverage: . +% if module_name == 'nise': +commands_pre = + # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. + nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s + +% endif commands = % if uses_other_wheel: ${wheel_env_no_py}: python -m build --wheel -% endif -% if module_name == 'nise': - # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. - nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s % endif # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now ${module_name}-system_tests: python -m pip install --disable-pip-version-check --upgrade pip diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index b20b86338..270f87e02 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -21,9 +21,11 @@ changedir = nise-system_tests: . nise-coverage: . -commands = +commands_pre = # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s + +commands = # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now nise-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nise-system_tests: python -c "import nise; nise.print_diagnostic_information()" From 608edbd2cc0985690e2ebaa9b361d8f62826ac23 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:53:04 -0500 Subject: [PATCH 6/8] Revert "Try moving vd creation to commands_pre" This reverts commit 371a3998f7501014c87317d20975866fd1396f58. --- build/templates/tox-system_tests.ini.mako | 10 ++++------ generated/nise/tox-system_tests.ini | 4 +--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 18a33913f..7a4565f35 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -52,16 +52,14 @@ changedir = ${module_name}-system_tests: . ${module_name}-coverage: . -% if module_name == 'nise': -commands_pre = - # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. - nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s - -% endif commands = % if uses_other_wheel: ${wheel_env_no_py}: python -m build --wheel +% endif +% if module_name == 'nise': + # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. + nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s % endif # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now ${module_name}-system_tests: python -m pip install --disable-pip-version-check --upgrade pip diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index 270f87e02..b20b86338 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -21,11 +21,9 @@ changedir = nise-system_tests: . nise-coverage: . -commands_pre = +commands = # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s - -commands = # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now nise-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nise-system_tests: python -c "import nise; nise.print_diagnostic_information()" From a831ef7945c2fd6abc284dba4afd6f9a702101ad Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:53:18 -0500 Subject: [PATCH 7/8] Revert "Create SwitchExecutiveExample VD before running system tests" This reverts commit 41bc4cbbfc170457dbc9c72ef4e48eab2a116a92. --- build/templates/tox-system_tests.ini.mako | 9 --------- generated/nise/tox-system_tests.ini | 5 ----- 2 files changed, 14 deletions(-) diff --git a/build/templates/tox-system_tests.ini.mako b/build/templates/tox-system_tests.ini.mako index 7a4565f35..a8c6d982c 100644 --- a/build/templates/tox-system_tests.ini.mako +++ b/build/templates/tox-system_tests.ini.mako @@ -33,11 +33,6 @@ ignore_basepython_conflict=True toxworkdir = ../../../.tox [testenv] -% if module_name == 'nise': -allowlist_externals = - C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe - -% endif description = % if uses_other_wheel: ${wheel_env_no_py}: Build the ${other_wheel} wheel because we use it in ${module_name} tests @@ -56,10 +51,6 @@ commands = % if uses_other_wheel: ${wheel_env_no_py}: python -m build --wheel -% endif -% if module_name == 'nise': - # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. - nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s % endif # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now ${module_name}-system_tests: python -m pip install --disable-pip-version-check --upgrade pip diff --git a/generated/nise/tox-system_tests.ini b/generated/nise/tox-system_tests.ini index b20b86338..1a7f41eaf 100644 --- a/generated/nise/tox-system_tests.ini +++ b/generated/nise/tox-system_tests.ini @@ -10,9 +10,6 @@ ignore_basepython_conflict=True toxworkdir = ../../../.tox [testenv] -allowlist_externals = - C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe - description = nise-system_tests: Run nise system tests (requires NI Switch Executive runtime to be installed) nise-coverage: Prepare coverage report for upload to codecov.io # upload handled by GitHub Actions @@ -22,8 +19,6 @@ changedir = nise-coverage: . commands = - # Create SwitchExecutiveExample Virtual Device, if it's missing. This device is used by the tests. - nise-system_tests: "C:\Program Files (x86)\National Instruments\Switch Executive\SwitchExecutive.exe" s # --disable-pip-version-check prevents pip from telling us we need to upgrade pip, since we are doing that now nise-system_tests: python -m pip install --disable-pip-version-check --upgrade pip nise-system_tests: python -c "import nise; nise.print_diagnostic_information()" From 55b114177e97f5c03b22cf009feacce6e2e8d3d9 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Fri, 19 Apr 2024 22:59:31 -0500 Subject: [PATCH 8/8] NISE runtime version rolled back due to bug that causes test failures --- README.rst | 2 +- docs/nise/status.inc | 2 +- generated/nise/README.rst | 2 +- src/nise/metadata/config_addon.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 502c4d1fa..fb77e7217 100644 --- a/README.rst +++ b/README.rst @@ -341,7 +341,7 @@ NI Switch Executive Python API Status +-------------------------------+---------------------+ | NI Switch Executive (nise) | | +===============================+=====================+ -| Driver Version Tested Against | 2023 Q4 | +| Driver Version Tested Against | 2023 Q1 | +-------------------------------+---------------------+ | PyPI Version | |niseLatestVersion| | +-------------------------------+---------------------+ diff --git a/docs/nise/status.inc b/docs/nise/status.inc index 01f225c25..365f879ed 100644 --- a/docs/nise/status.inc +++ b/docs/nise/status.inc @@ -5,7 +5,7 @@ NI Switch Executive Python API Status +-------------------------------+---------------------+ | NI Switch Executive (nise) | | +===============================+=====================+ -| Driver Version Tested Against | 2023 Q4 | +| Driver Version Tested Against | 2023 Q1 | +-------------------------------+---------------------+ | PyPI Version | |niseLatestVersion| | +-------------------------------+---------------------+ diff --git a/generated/nise/README.rst b/generated/nise/README.rst index 03bf9986a..36e7d0b90 100644 --- a/generated/nise/README.rst +++ b/generated/nise/README.rst @@ -53,7 +53,7 @@ NI Switch Executive Python API Status +-------------------------------+---------------------+ | NI Switch Executive (nise) | | +===============================+=====================+ -| Driver Version Tested Against | 2023 Q4 | +| Driver Version Tested Against | 2023 Q1 | +-------------------------------+---------------------+ | PyPI Version | |niseLatestVersion| | +-------------------------------+---------------------+ diff --git a/src/nise/metadata/config_addon.py b/src/nise/metadata/config_addon.py index 70063c097..dea16df51 100644 --- a/src/nise/metadata/config_addon.py +++ b/src/nise/metadata/config_addon.py @@ -1,6 +1,6 @@ # We need to maintain the version here since it needs to be updated by the build process on GitHub config_additional_config = { 'module_version': '1.4.8.dev0', - 'latest_runtime_version_tested_against': '2023 Q4', + 'latest_runtime_version_tested_against': '2023 Q1', 'initial_release_year': '2018', }