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 diff --git a/build/templates/setup.py.mako b/build/templates/setup.py.mako index 5885fd1b6..aea83db96 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']}' @@ -61,9 +49,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 +66,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..4e47744ca 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' @@ -50,9 +38,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -70,6 +55,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..79a6d655b 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' @@ -51,9 +39,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -71,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/nidmm/setup.py b/generated/nidmm/setup.py index 44eb7624f..54fb4a776 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' @@ -50,9 +38,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -70,6 +55,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..f37aea288 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' @@ -51,9 +39,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -71,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/nifgen/setup.py b/generated/nifgen/setup.py index d743ce1bc..ea53af6ab 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' @@ -51,9 +39,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -71,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/nimodinst/setup.py b/generated/nimodinst/setup.py index 98adb7fa8..963324567 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' @@ -44,9 +32,6 @@ def read_contents(file_to_read): install_requires=[ 'hightime>=0.2.0', ], - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -64,6 +49,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..69abced6c 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' @@ -51,9 +39,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -71,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/nise/setup.py b/generated/nise/setup.py index 251e7a3f1..d998747ed 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' @@ -44,9 +32,6 @@ def read_contents(file_to_read): install_requires=[ 'hightime>=0.2.0', ], - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -64,6 +49,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..841e64d21 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' @@ -50,9 +38,6 @@ def read_contents(file_to_read): 'protobuf>=4.21.6,<5.0' ], }, - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -70,6 +55,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..8d42cc72c 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' @@ -44,9 +32,6 @@ def read_contents(file_to_read): install_requires=[ 'hightime>=0.2.0', ], - setup_requires=['pytest-runner', ], - tests_require=['pytest'], - test_suite='tests', classifiers=[ "Development Status :: 3 - Alpha", "Intended Audience :: Developers", @@ -64,6 +49,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']}, )