Update test scripts with correct defaults and avoid obsolete functions in setuptools

Author: ladc

tests/test_bake_project.py

@@ -8,7 +8,6 @@
 import datetime
 import os
 import subprocess
-import sys
 from cookiecutter.utils import rmtree
 
 
@@ -34,6 +33,7 @@ def bake_in_temp_dir(cookies, *args, **kwargs):
         cookie to be baked and its temporal files will be removed
     """
     result = cookies.bake(*args, **kwargs)
+
     try:
         yield result
     finally:
@@ -80,15 +80,15 @@ def test_bake_with_defaults(cookies):
 
         found_toplevel_files = [f.basename for f in result.project.listdir()]
         assert "setup.py" in found_toplevel_files
-        assert "pysteps_importer_abc" in found_toplevel_files
+        assert "pysteps_importer_institution_name" in found_toplevel_files
         assert "tox.ini" in found_toplevel_files
         assert "tests" in found_toplevel_files
 
 
 def test_bake_and_run_tests(cookies):
     with bake_in_temp_dir(cookies) as result:
         assert result.project.isdir()
-        assert run_inside_dir("python setup.py test", str(result.project)) == 0
+        assert run_inside_dir("pytest", str(result.project)) == 0
 
 
 def test_bake_withspecialchars_and_run_tests(cookies):
@@ -97,14 +97,14 @@ def test_bake_withspecialchars_and_run_tests(cookies):
         cookies, extra_context={"full_name": 'name "quote" name'}
     ) as result:
         assert result.project.isdir()
-        assert run_inside_dir("python setup.py test", str(result.project)) == 0
+        assert run_inside_dir("pytest", str(result.project)) == 0
 
 
 def test_bake_with_apostrophe_and_run_tests(cookies):
     """Ensure that a `full_name` with apostrophes does not break setup.py"""
     with bake_in_temp_dir(cookies, extra_context={"full_name": "O'connor"}) as result:
         assert result.project.isdir()
-        assert run_inside_dir("python setup.py test", str(result.project)) == 0
+        assert run_inside_dir("pytest", str(result.project)) == 0
 
 
 def test_bake_selecting_license(cookies):
@@ -137,9 +137,9 @@ def test_bake_not_open_source(cookies):
 def test_using_pytest(cookies):
     with bake_in_temp_dir(cookies, extra_context={"use_pytest": "y"}) as result:
         assert result.project.isdir()
-        test_file_path = result.project.join("tests/test_pysteps_importer_abc.py")
+        test_file_path = result.project.join("tests/test_pysteps_importer_institution_name.py")
         lines = test_file_path.readlines()
         # Test the new pytest target
-        assert run_inside_dir("python setup.py pytest", str(result.project)) == 0
+        assert run_inside_dir("pytest", str(result.project)) == 0
         # Test the test alias (which invokes pytest)
-        assert run_inside_dir("python setup.py test", str(result.project)) == 0
+        assert run_inside_dir("pytest", str(result.project)) == 0

{{cookiecutter.project_name}}/setup.py

@@ -15,6 +15,13 @@
 
 test_requirements = ['pytest>=3']
 
+# Custom command to run tests using pytest
+def run_tests():
+    import pytest
+    errno = pytest.main(["tests"])
+    raise SystemExit(errno)
+
+
 {%- set license_classifiers = {
     'MIT license': 'License :: OSI Approved :: MIT License',
     'BSD license': 'License :: OSI Approved :: BSD License',
@@ -54,8 +61,6 @@
     license="{{ cookiecutter.open_source_license }}",
 {%- endif %}
     long_description=readme,
-    test_suite='tests',
-    tests_require=test_requirements,
     include_package_data=True,
     keywords=['{{ cookiecutter.project_slug }}', 'pysteps' , 'plugin', '{{ cookiecutter.plugin_type }}'],
     name='{{ cookiecutter.project_name }}',
@@ -91,4 +96,7 @@
     entry_points = entry,
     version='{{ cookiecutter.version }}',
     zip_safe=False,
+    cmdclass = {
+        'test': run_tests,
+    },
 )