test: 'make upgrade' always

cookiecutter-django-ida/{{cookiecutter.repo_name}}/{{cookiecutter.project_name}}/settings/devstack.py

@@ -33,7 +33,7 @@
 BACKEND_SERVICE_EDX_OAUTH2_SECRET = os.environ.get(
     'BACKEND_SERVICE_EDX_OAUTH2_SECRET',
     '{{cookiecutter.project_name}}-backend-service-secret'
-)  # noqa: E501
+)
 
 JWT_AUTH.update({
     'JWT_SECRET_KEY': 'lms-secret',

python-template/{{cookiecutter.placeholder_repo_name}}/requirements/test.in

@@ -3,4 +3,5 @@
 
 -r base.txt               # Core dependencies for this package
 
+pytest
 pytest-cov                # pytest extension for code coverage statistics

tests/test_cookiecutter_django_app.py

@@ -69,6 +69,9 @@ def fixture_options_baked(cookies_session, request, custom_template):
     baked result.
     """
     with bake_in_temp_dir(cookies_session, extra_context=request.param, template=custom_template):
+        sh.make('upgrade')
+        sh.pip('install', '-r', 'requirements/test.txt')
+
         yield request.param
 
 
@@ -146,11 +149,6 @@ def test_setup_py(options_baked):
     assert "    author_email='cookie@monster.org'," in setup_text
 
 
-def test_upgrade(options_baked):
-    """Make sure the upgrade target works"""
-    run_in_virtualenv('make upgrade')
-
-
 def test_quality(options_baked):
     """Run quality tests on the given generated output."""
     py_files = [name for name in all_files() if name.endswith(".py")]

tests/test_cookiecutter_django_ida.py

@@ -11,7 +11,7 @@
 
 from .bake import bake_in_temp_dir
 from .common_tests import *  # pylint: disable=wildcard-import
-from .venv import all_files, run_in_virtualenv
+from .venv import all_files
 
 LOGGING_CONFIG = {
     'version': 1,
@@ -59,6 +59,9 @@ def fixture_options_baked(cookies_session, request, custom_template):
     baked result.
     """
     with bake_in_temp_dir(cookies_session, extra_context=request.param, template=custom_template):
+        sh.make('upgrade')
+        sh.pip('install', '-r', 'requirements/test.txt')
+
         yield request.param
 
 
@@ -88,16 +91,8 @@ def test_github_actions_ci(options_baked):
     assert 'pip install -r requirements/ci.txt' in ci_text
 
 
-def test_upgrade(options_baked):
-    """Make sure the upgrade target works"""
-    run_in_virtualenv('make upgrade')
-
-
 def test_quality(options_baked):
     """Run quality tests on the given generated output."""
-    sh.make('upgrade')
-    sh.pip('install', '-r', 'requirements/test.txt')
-
     py_files = [name for name in all_files() if name.endswith(".py")]
     sh.pylint(*py_files)
     sh.pycodestyle(*py_files)

tests/test_cookiecutter_python_library.py

@@ -60,6 +60,9 @@ def fixture_options_baked(cookies_session, request, custom_template):
     baked result.
     """
     with bake_in_temp_dir(cookies_session, extra_context=request.param, template=custom_template):
+        sh.make('upgrade')
+        sh.pip('install', '-r', 'requirements/test.txt')
+
         yield request.param
 
 
@@ -109,7 +112,5 @@ def test_setup_py(options_baked):
 def test_tests_and_quality(options_baked):
     """
     Run generated tests and quality checks.
-
-    This also tests `make upgrade` by necessity, since it needs the requirements files.
     """
-    run_in_virtualenv('make upgrade requirements test-all')
+    run_in_virtualenv('make requirements test-all')

tests/test_cookiecutter_xblock.py

@@ -11,7 +11,7 @@
 
 from .bake import bake_in_temp_dir
 from .common_tests import *  # pylint: disable=wildcard-import
-from .venv import all_files, run_in_virtualenv
+from .venv import all_files
 
 LOGGING_CONFIG = {
     'version': 1,
@@ -60,6 +60,8 @@ def fixture_options_baked(cookies_session, request, custom_template):
     baked result.
     """
     with bake_in_temp_dir(cookies_session, extra_context=request.param, template=custom_template):
+        sh.make('upgrade')
+        sh.pip('install', '-r', 'requirements/test.txt')
         yield request.param
 
 
@@ -100,16 +102,8 @@ def test_setup_py(options_baked):
     assert "    author_email='cookie@monster.org'," in setup_text
 
 
-def test_upgrade(options_baked):
-    """Make sure the upgrade target works"""
-    run_in_virtualenv('make upgrade')
-
-
 def test_quality(options_baked):
     """Run quality tests on the given generated output."""
-    sh.make('upgrade')
-    sh.pip('install', '-r', 'requirements/base.txt')
-
     py_files = [name for name in all_files() if name.endswith(".py")]
     sh.pylint(*py_files)
     sh.pycodestyle(*py_files)