Skip to content

Commit 573b8c8

Browse files
ni-jfitzgerni-jfitzger
committed
- Delete deprecated imports and unsupported distribution options
- Delete test cmdclass so that we don't break tox -e installers
1 parent afd791e commit 573b8c8

File tree

11 files changed

+0
-165
lines changed

11 files changed

+0
-165
lines changed

‎build/templates/setup.py.mako‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,9 @@ grpc_supported = template_parameters['include_grpc_support']
88
module_version = config['module_version']
99
%>
1010

11-
from setuptools.command.test import test as test_command
1211
from setuptools import setup
1312

1413

15-
class PyTest(test_command):
16-
def finalize_options(self):
17-
test_command.finalize_options(self)
18-
self.test_args = []
19-
self.test_suite = True
20-
21-
def run_tests(self):
22-
import pytest
23-
pytest.main(self.test_args)
24-
25-
2614
pypi_name = '${config['module_name']}'
2715

2816

@@ -62,8 +50,6 @@ setup(
6250
},
6351
% endif
6452
setup_requires=['pytest-runner', ],
65-
tests_require=['pytest'],
66-
test_suite='tests',
6753
classifiers=[
6854
"Development Status :: ${helper.get_development_status(config)}",
6955
"Intended Audience :: Developers",
@@ -81,6 +67,5 @@ setup(
8167
"Programming Language :: Python :: Implementation :: CPython",
8268
"Topic :: System :: Hardware :: Hardware Drivers"
8369
],
84-
cmdclass={'test': PyTest},
8570
package_data={pypi_name: ['VERSION']},
8671
)

‎generated/nidcpower/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'nidcpower'
219

2210

@@ -51,8 +39,6 @@ def read_contents(file_to_read):
5139
],
5240
},
5341
setup_requires=['pytest-runner', ],
54-
tests_require=['pytest'],
55-
test_suite='tests',
5642
classifiers=[
5743
"Development Status :: 3 - Alpha",
5844
"Intended Audience :: Developers",
@@ -70,6 +56,5 @@ def read_contents(file_to_read):
7056
"Programming Language :: Python :: Implementation :: CPython",
7157
"Topic :: System :: Hardware :: Hardware Drivers"
7258
],
73-
cmdclass={'test': PyTest},
7459
package_data={pypi_name: ['VERSION']},
7560
)

‎generated/nidigital/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'nidigital'
219

2210

@@ -52,8 +40,6 @@ def read_contents(file_to_read):
5240
],
5341
},
5442
setup_requires=['pytest-runner', ],
55-
tests_require=['pytest'],
56-
test_suite='tests',
5743
classifiers=[
5844
"Development Status :: 3 - Alpha",
5945
"Intended Audience :: Developers",
@@ -71,6 +57,5 @@ def read_contents(file_to_read):
7157
"Programming Language :: Python :: Implementation :: CPython",
7258
"Topic :: System :: Hardware :: Hardware Drivers"
7359
],
74-
cmdclass={'test': PyTest},
7560
package_data={pypi_name: ['VERSION']},
7661
)

‎generated/nidmm/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'nidmm'
219

2210

@@ -51,8 +39,6 @@ def read_contents(file_to_read):
5139
],
5240
},
5341
setup_requires=['pytest-runner', ],
54-
tests_require=['pytest'],
55-
test_suite='tests',
5642
classifiers=[
5743
"Development Status :: 3 - Alpha",
5844
"Intended Audience :: Developers",
@@ -70,6 +56,5 @@ def read_contents(file_to_read):
7056
"Programming Language :: Python :: Implementation :: CPython",
7157
"Topic :: System :: Hardware :: Hardware Drivers"
7258
],
73-
cmdclass={'test': PyTest},
7459
package_data={pypi_name: ['VERSION']},
7560
)

‎generated/nifake/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'nifake'
219

2210

@@ -52,8 +40,6 @@ def read_contents(file_to_read):
5240
],
5341
},
5442
setup_requires=['pytest-runner', ],
55-
tests_require=['pytest'],
56-
test_suite='tests',
5743
classifiers=[
5844
"Development Status :: 3 - Alpha",
5945
"Intended Audience :: Developers",
@@ -71,6 +57,5 @@ def read_contents(file_to_read):
7157
"Programming Language :: Python :: Implementation :: CPython",
7258
"Topic :: System :: Hardware :: Hardware Drivers"
7359
],
74-
cmdclass={'test': PyTest},
7560
package_data={pypi_name: ['VERSION']},
7661
)

‎generated/nifgen/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'nifgen'
219

2210

@@ -52,8 +40,6 @@ def read_contents(file_to_read):
5240
],
5341
},
5442
setup_requires=['pytest-runner', ],
55-
tests_require=['pytest'],
56-
test_suite='tests',
5743
classifiers=[
5844
"Development Status :: 3 - Alpha",
5945
"Intended Audience :: Developers",
@@ -71,6 +57,5 @@ def read_contents(file_to_read):
7157
"Programming Language :: Python :: Implementation :: CPython",
7258
"Topic :: System :: Hardware :: Hardware Drivers"
7359
],
74-
cmdclass={'test': PyTest},
7560
package_data={pypi_name: ['VERSION']},
7661
)

‎generated/nimodinst/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'nimodinst'
219

2210

@@ -45,8 +33,6 @@ def read_contents(file_to_read):
4533
'hightime>=0.2.0',
4634
],
4735
setup_requires=['pytest-runner', ],
48-
tests_require=['pytest'],
49-
test_suite='tests',
5036
classifiers=[
5137
"Development Status :: 3 - Alpha",
5238
"Intended Audience :: Developers",
@@ -64,6 +50,5 @@ def read_contents(file_to_read):
6450
"Programming Language :: Python :: Implementation :: CPython",
6551
"Topic :: System :: Hardware :: Hardware Drivers"
6652
],
67-
cmdclass={'test': PyTest},
6853
package_data={pypi_name: ['VERSION']},
6954
)

‎generated/niscope/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'niscope'
219

2210

@@ -52,8 +40,6 @@ def read_contents(file_to_read):
5240
],
5341
},
5442
setup_requires=['pytest-runner', ],
55-
tests_require=['pytest'],
56-
test_suite='tests',
5743
classifiers=[
5844
"Development Status :: 3 - Alpha",
5945
"Intended Audience :: Developers",
@@ -71,6 +57,5 @@ def read_contents(file_to_read):
7157
"Programming Language :: Python :: Implementation :: CPython",
7258
"Topic :: System :: Hardware :: Hardware Drivers"
7359
],
74-
cmdclass={'test': PyTest},
7560
package_data={pypi_name: ['VERSION']},
7661
)

‎generated/nise/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'nise'
219

2210

@@ -45,8 +33,6 @@ def read_contents(file_to_read):
4533
'hightime>=0.2.0',
4634
],
4735
setup_requires=['pytest-runner', ],
48-
tests_require=['pytest'],
49-
test_suite='tests',
5036
classifiers=[
5137
"Development Status :: 3 - Alpha",
5238
"Intended Audience :: Developers",
@@ -64,6 +50,5 @@ def read_contents(file_to_read):
6450
"Programming Language :: Python :: Implementation :: CPython",
6551
"Topic :: System :: Hardware :: Hardware Drivers"
6652
],
67-
cmdclass={'test': PyTest},
6853
package_data={pypi_name: ['VERSION']},
6954
)

‎generated/niswitch/setup.py‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
# This file was generated
33

44

5-
from setuptools.command.test import test as test_command
65
from setuptools import setup
76

87

9-
class PyTest(test_command):
10-
def finalize_options(self):
11-
test_command.finalize_options(self)
12-
self.test_args = []
13-
self.test_suite = True
14-
15-
def run_tests(self):
16-
import pytest
17-
pytest.main(self.test_args)
18-
19-
208
pypi_name = 'niswitch'
219

2210

@@ -51,8 +39,6 @@ def read_contents(file_to_read):
5139
],
5240
},
5341
setup_requires=['pytest-runner', ],
54-
tests_require=['pytest'],
55-
test_suite='tests',
5642
classifiers=[
5743
"Development Status :: 3 - Alpha",
5844
"Intended Audience :: Developers",
@@ -70,6 +56,5 @@ def read_contents(file_to_read):
7056
"Programming Language :: Python :: Implementation :: CPython",
7157
"Topic :: System :: Hardware :: Hardware Drivers"
7258
],
73-
cmdclass={'test': PyTest},
7459
package_data={pypi_name: ['VERSION']},
7560
)

0 commit comments

Comments
 (0)