From 573b8c891bdeb0b1bb3206e22c3f4580f78515e8 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:21:04 -0600 Subject: [PATCH 1/3] - Delete deprecated imports and unsupported distribution options - Delete test cmdclass so that we don't break tox -e installers --- build/templates/setup.py.mako | 15 --------------- generated/nidcpower/setup.py | 15 --------------- generated/nidigital/setup.py | 15 --------------- generated/nidmm/setup.py | 15 --------------- generated/nifake/setup.py | 15 --------------- generated/nifgen/setup.py | 15 --------------- generated/nimodinst/setup.py | 15 --------------- generated/niscope/setup.py | 15 --------------- generated/nise/setup.py | 15 --------------- generated/niswitch/setup.py | 15 --------------- generated/nitclk/setup.py | 15 --------------- 11 files changed, 165 deletions(-) diff --git a/build/templates/setup.py.mako b/build/templates/setup.py.mako index 5885fd1b6..6fd4996cb 100644 --- a/build/templates/setup.py.mako +++ b/build/templates/setup.py.mako @@ -8,21 +8,9 @@ grpc_supported = template_parameters['include_grpc_support'] module_version = config['module_version'] %> -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = '${config['module_name']}' @@ -62,8 +50,6 @@ setup( }, % endif setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: ${helper.get_development_status(config)}", "Intended Audience :: Developers", @@ -81,6 +67,5 @@ setup( "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/nidcpower/setup.py b/generated/nidcpower/setup.py index 496c809e3..f1e0b4ed3 100644 --- a/generated/nidcpower/setup.py +++ b/generated/nidcpower/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'nidcpower' @@ -51,8 +39,6 @@ def read_contents(file_to_read): ], }, setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -70,6 +56,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/nidigital/setup.py b/generated/nidigital/setup.py index ed7b031ec..02f358710 100644 --- a/generated/nidigital/setup.py +++ b/generated/nidigital/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'nidigital' @@ -52,8 +40,6 @@ def read_contents(file_to_read): ], }, setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -71,6 +57,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/nidmm/setup.py b/generated/nidmm/setup.py index 44eb7624f..e5f1ca418 100644 --- a/generated/nidmm/setup.py +++ b/generated/nidmm/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'nidmm' @@ -51,8 +39,6 @@ def read_contents(file_to_read): ], }, setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -70,6 +56,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/nifake/setup.py b/generated/nifake/setup.py index 3d0cd34c1..7fdac5e2c 100644 --- a/generated/nifake/setup.py +++ b/generated/nifake/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'nifake' @@ -52,8 +40,6 @@ def read_contents(file_to_read): ], }, setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -71,6 +57,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/nifgen/setup.py b/generated/nifgen/setup.py index d743ce1bc..469bb5daa 100644 --- a/generated/nifgen/setup.py +++ b/generated/nifgen/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'nifgen' @@ -52,8 +40,6 @@ def read_contents(file_to_read): ], }, setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -71,6 +57,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/nimodinst/setup.py b/generated/nimodinst/setup.py index 98adb7fa8..589085d47 100644 --- a/generated/nimodinst/setup.py +++ b/generated/nimodinst/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'nimodinst' @@ -45,8 +33,6 @@ def read_contents(file_to_read): 'hightime>=0.2.0', ], setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -64,6 +50,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/niscope/setup.py b/generated/niscope/setup.py index f213c48e1..a026f35b7 100644 --- a/generated/niscope/setup.py +++ b/generated/niscope/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'niscope' @@ -52,8 +40,6 @@ def read_contents(file_to_read): ], }, setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -71,6 +57,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/nise/setup.py b/generated/nise/setup.py index 251e7a3f1..40dd3baf5 100644 --- a/generated/nise/setup.py +++ b/generated/nise/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'nise' @@ -45,8 +33,6 @@ def read_contents(file_to_read): 'hightime>=0.2.0', ], setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -64,6 +50,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/niswitch/setup.py b/generated/niswitch/setup.py index e09dc8de1..e2f8512b7 100644 --- a/generated/niswitch/setup.py +++ b/generated/niswitch/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'niswitch' @@ -51,8 +39,6 @@ def read_contents(file_to_read): ], }, setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -70,6 +56,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) diff --git a/generated/nitclk/setup.py b/generated/nitclk/setup.py index 8719085b1..5d5da04b1 100644 --- a/generated/nitclk/setup.py +++ b/generated/nitclk/setup.py @@ -2,21 +2,9 @@ # This file was generated -from setuptools.command.test import test as test_command from setuptools import setup -class PyTest(test_command): - def finalize_options(self): - test_command.finalize_options(self) - self.test_args = [] - self.test_suite = True - - def run_tests(self): - import pytest - pytest.main(self.test_args) - - pypi_name = 'nitclk' @@ -45,8 +33,6 @@ def read_contents(file_to_read): 'hightime>=0.2.0', ], setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -64,6 +50,5 @@ def read_contents(file_to_read): "Programming Language :: Python :: Implementation :: CPython", "Topic :: System :: Hardware :: Hardware Drivers" ], - cmdclass={'test': PyTest}, package_data={pypi_name: ['VERSION']}, ) From acdb799fbf92fd8e13ffe034b3ba78a66f12515d Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:54:28 -0600 Subject: [PATCH 2/3] Delete setup_requires --- 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 deletions(-) diff --git a/build/templates/setup.py.mako b/build/templates/setup.py.mako index 6fd4996cb..aea83db96 100644 --- a/build/templates/setup.py.mako +++ b/build/templates/setup.py.mako @@ -49,7 +49,6 @@ setup( ], }, % endif - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: ${helper.get_development_status(config)}", "Intended Audience :: Developers", diff --git a/generated/nidcpower/setup.py b/generated/nidcpower/setup.py index f1e0b4ed3..4e47744ca 100644 --- a/generated/nidcpower/setup.py +++ b/generated/nidcpower/setup.py @@ -38,7 +38,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/nidigital/setup.py b/generated/nidigital/setup.py index 02f358710..79a6d655b 100644 --- a/generated/nidigital/setup.py +++ b/generated/nidigital/setup.py @@ -39,7 +39,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/nidmm/setup.py b/generated/nidmm/setup.py index e5f1ca418..54fb4a776 100644 --- a/generated/nidmm/setup.py +++ b/generated/nidmm/setup.py @@ -38,7 +38,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/nifake/setup.py b/generated/nifake/setup.py index 7fdac5e2c..f37aea288 100644 --- a/generated/nifake/setup.py +++ b/generated/nifake/setup.py @@ -39,7 +39,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/nifgen/setup.py b/generated/nifgen/setup.py index 469bb5daa..ea53af6ab 100644 --- a/generated/nifgen/setup.py +++ b/generated/nifgen/setup.py @@ -39,7 +39,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/nimodinst/setup.py b/generated/nimodinst/setup.py index 589085d47..963324567 100644 --- a/generated/nimodinst/setup.py +++ b/generated/nimodinst/setup.py @@ -32,7 +32,6 @@ def read_contents(file_to_read): install_requires=[ 'hightime>=0.2.0', ], - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/niscope/setup.py b/generated/niscope/setup.py index a026f35b7..69abced6c 100644 --- a/generated/niscope/setup.py +++ b/generated/niscope/setup.py @@ -39,7 +39,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/nise/setup.py b/generated/nise/setup.py index 40dd3baf5..d998747ed 100644 --- a/generated/nise/setup.py +++ b/generated/nise/setup.py @@ -32,7 +32,6 @@ def read_contents(file_to_read): install_requires=[ 'hightime>=0.2.0', ], - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/niswitch/setup.py b/generated/niswitch/setup.py index e2f8512b7..841e64d21 100644 --- a/generated/niswitch/setup.py +++ b/generated/niswitch/setup.py @@ -38,7 +38,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", diff --git a/generated/nitclk/setup.py b/generated/nitclk/setup.py index 5d5da04b1..8d42cc72c 100644 --- a/generated/nitclk/setup.py +++ b/generated/nitclk/setup.py @@ -32,7 +32,6 @@ def read_contents(file_to_read): install_requires=[ 'hightime>=0.2.0', ], - setup_requires=['pytest-runner', ], classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", From 8df73c61b7e4622ee99b0c803767e2127a85dc55 Mon Sep 17 00:00:00 2001 From: Jay Fitzgerald <34140133+ni-jfitzger@users.noreply.github.com> Date: Sat, 25 Jan 2025 17:55:18 -0600 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10acff81d..9f4875f58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ All notable changes to this project will be documented in this file. * ### ALL * #### Added * #### Changed + * Fix [#2069](https://github.com/ni/nimi-python/issues/2069) * #### Removed * ### `nidcpower` (NI-DCPower) * #### Added