some machines may not have tree command, and python3.7 does not work

with django 1.x (vs python2.7 does not work with django 2.x)

Author: conradho

tests/test_django_project.py

@@ -8,6 +8,7 @@
 from unittest.mock import Mock, call
 
 import pytest
+
 import pythonanywhere.django_project
 from pythonanywhere.django_project import DjangoProject
 from pythonanywhere.exceptions import SanityException
@@ -283,10 +284,13 @@ def test_updates_wsgi_file_from_template(self):
     def test_actually_produces_wsgi_file_that_can_import_project_non_nested(
         self, fake_home, non_nested_submodule, virtualenvs_folder
     ):
-        project = DjangoProject("mydomain.com", ".".join(python_version().split(".")[:2]))
+        running_python_version = ".".join(python_version().split(".")[:2])
+        project = DjangoProject("mydomain.com", running_python_version)
         shutil.copytree(str(non_nested_submodule), str(project.project_path))
-        print(subprocess.check_call(["tree", str(project.project_path)]))
-        project.create_virtualenv()
+        if running_python_version == "3.7":
+            project.create_virtualenv(django_version="latest")
+        else:
+            project.create_virtualenv()
         project.find_django_files()
         project.wsgi_file_path = Path(tempfile.NamedTemporaryFile().name)
 
@@ -299,9 +303,13 @@ def test_actually_produces_wsgi_file_that_can_import_project_non_nested(
     def test_actually_produces_wsgi_file_that_can_import_nested_project(
         self, fake_home, more_nested_submodule, virtualenvs_folder
     ):
-        project = DjangoProject("mydomain.com", ".".join(python_version().split(".")[:2]))
+        running_python_version = ".".join(python_version().split(".")[:2])
+        project = DjangoProject("mydomain.com", running_python_version)
         shutil.copytree(str(more_nested_submodule), str(project.project_path))
-        project.create_virtualenv()
+        if running_python_version == "3.7":
+            project.create_virtualenv(django_version="latest")
+        else:
+            project.create_virtualenv()
         project.find_django_files()
         project.wsgi_file_path = Path(tempfile.NamedTemporaryFile().name)
 

tests/test_pa_start_django_webapp_with_virtualenv.py

@@ -73,9 +73,16 @@ def test_nuke_option_lets_you_run_twice(self, fake_home, virtualenvs_folder, api
 
         with patch("scripts.pa_start_django_webapp_with_virtualenv.DjangoProject.update_wsgi_file"):
             with patch("pythonanywhere.api.call_api"):
-                version = ".".join(python_version().split(".")[:2])
-                main("mydomain.com", "1.9.2", version, nuke=False)
-                main("mydomain.com", "1.11.3", version, nuke=True)
+                running_python_version = ".".join(python_version().split(".")[:2])
+                if running_python_version[0] == 2:
+                    old_django_version = "1.9.2"
+                    new_django_version = "1.11.3"
+                else:
+                    old_django_version = "2.0.8"
+                    new_django_version = "2.1.2"
+
+                main("mydomain.com", old_django_version, running_python_version, nuke=False)
+                main("mydomain.com", new_django_version, running_python_version, nuke=True)
 
         django_version = (
             subprocess.check_output(
@@ -87,4 +94,4 @@ def test_nuke_option_lets_you_run_twice(self, fake_home, virtualenvs_folder, api
             .decode()
             .strip()
         )
-        assert django_version == "1.11.3"
+        assert django_version == new_django_version