Extracted method on DjangoProject to compare Django versions. by: Filip, Piotr

Co-authored-by: Filip Łajszczak <[email protected]>

Author: caseneuve

pythonanywhere/django_project.py

@@ -11,6 +11,9 @@
 
 
 class DjangoProject(Project):
+    def django_version_newer_or_equal_than(self, this_version):
+        return version.parse(self.virtualenv.get_version("django")) >= version.parse(this_version)
+
     def download_repo(self, repo, nuke):
         if nuke and self.project_path.exists():
             shutil.rmtree(str(self.project_path))
@@ -94,7 +97,7 @@ def update_settings_file(self):
             f'ALLOWED_HOSTS = [{self.domain!r}]'
         )
 
-        new_django = version.parse(self.virtualenv.get_version("django")) >= version.parse("3.1")
+        new_django = self.django_version_newer_or_equal_than("3.1")
 
         if re.search(r'^MEDIA_ROOT\s*=', settings, flags=re.MULTILINE) is None:
             new_settings += "\nMEDIA_URL = '/media/'"

tests/test_django_project.py

@@ -14,6 +14,34 @@
 from pythonanywhere.exceptions import SanityException
 
 
+@pytest.fixture
+def project_with_mock_virtualenv(virtualenvs_folder):
+    project = DjangoProject("mydomain.com", "python.version")
+    project.virtualenv.create = Mock()
+    project.virtualenv.pip_install = Mock()
+    yield project
+
+
+class TestDjangoVersionNewerThan:
+    def test_returns_true_if_django_version_is_newer_than_provided_version(
+            self, project_with_mock_virtualenv
+    ):
+        project_with_mock_virtualenv.virtualenv.get_version = Mock(return_value="9.9.9")
+        assert project_with_mock_virtualenv.django_version_newer_or_equal_than("1.1.1") is True
+
+    def test_returns_true_when_django_version_is_the_same_as_provided_version(
+            self, project_with_mock_virtualenv
+    ):
+        project_with_mock_virtualenv.virtualenv.get_version = Mock(return_value="9.9.9")
+        assert project_with_mock_virtualenv.django_version_newer_or_equal_than("9.9.9") is True
+
+    def test_returns_false_when_django_version_is_older_than_provided_version(
+            self, project_with_mock_virtualenv
+    ):
+        project_with_mock_virtualenv.virtualenv.get_version = Mock(return_value="9.9.9")
+        assert project_with_mock_virtualenv.django_version_newer_or_equal_than("10.1.1") is False
+
+
 class TestDownloadRepo:
     @pytest.mark.slowtest
     def test_actually_downloads_repo(self, fake_home, virtualenvs_folder):
@@ -146,14 +174,6 @@ def test_if_requirements_txt_exists(self, fake_home, virtualenvs_folder):
         assert project.detect_requirements() == f"-r {requirements_txt.resolve()}"
 
 
-@pytest.fixture
-def project_with_mock_virtualenv(virtualenvs_folder):
-    project = DjangoProject("mydomain.com", "python.version")
-    project.virtualenv.create = Mock()
-    project.virtualenv.pip_install = Mock()
-    yield project
-
-
 class TestCreateVirtualenv:
     def test_calls_virtualenv_create(self, project_with_mock_virtualenv):
         project_with_mock_virtualenv.create_virtualenv("django.version", nuke="nuke option")
@@ -286,7 +306,7 @@ class TestUpdateSettingsFile:
     def test_adds_STATIC_and_MEDIA_config_to_settings_with_old_django(self, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
         project.settings_path = Path(tempfile.NamedTemporaryFile().name)
-        project.virtualenv.get_version = Mock(return_value="1.0")
+        project.virtualenv.get_version = Mock(return_value="3.0")
 
         with project.settings_path.open("w") as f:
             f.write(
@@ -338,7 +358,7 @@ def test_adds_STATIC_and_MEDIA_config_to_settings_with_new_django(self, virtuale
     def test_adds_domain_to_ALLOWED_HOSTS(self, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
         project.settings_path = Path(tempfile.NamedTemporaryFile().name)
-        project.virtualenv.get_version = Mock(return_value="1.0")
+        project.virtualenv.get_version = Mock(return_value="3.0")
 
         with project.settings_path.open("w") as f:
             f.write(
@@ -361,7 +381,7 @@ def test_adds_domain_to_ALLOWED_HOSTS(self, virtualenvs_folder):
     def test_only_adds_MEDIA_URL_if_its_not_already_there(self, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
         project.settings_path = Path(tempfile.NamedTemporaryFile().name)
-        project.virtualenv.get_version = Mock(return_value="1.0")
+        project.virtualenv.get_version = Mock(return_value="3.0")
 
         with project.settings_path.open("w") as f:
             f.write(
@@ -386,7 +406,7 @@ def test_only_adds_MEDIA_URL_if_its_not_already_there(self, virtualenvs_folder):
     def test_only_adds_STATIC_ROOT_if_its_not_already_there(self, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
         project.settings_path = Path(tempfile.NamedTemporaryFile().name)
-        project.virtualenv.get_version = Mock(return_value="1.0")
+        project.virtualenv.get_version = Mock(return_value="3.0")
 
         with project.settings_path.open("w") as f:
             f.write(
@@ -411,7 +431,7 @@ def test_only_adds_STATIC_ROOT_if_its_not_already_there(self, virtualenvs_folder
     def test_only_adds_MEDIA_ROOT_if_its_not_already_there(self, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
         project.settings_path = Path(tempfile.NamedTemporaryFile().name)
-        project.virtualenv.get_version = Mock(return_value="1.0")
+        project.virtualenv.get_version = Mock(return_value="3.0")
 
         with project.settings_path.open("w") as f:
             f.write(