Use correct django-admin executable in DjangoProject. by: Filip, Piotr

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

Author: caseneuve

pythonanywhere/django_project.py

@@ -54,24 +54,25 @@ def create_virtualenv(self, django_version=None, nuke=False):
             packages = f'django=={django_version}'
         self.virtualenv.pip_install(packages)
 
-
     def detect_requirements(self):
         requirements_txt = self.project_path / 'requirements.txt'
         if requirements_txt.exists():
             return f'-r {requirements_txt.resolve()}'
         return 'django'
 
-
-
     def run_startproject(self, nuke):
         print(snakesay('Starting Django project'))
         if nuke and self.project_path.exists():
             shutil.rmtree(str(self.project_path))
         self.project_path.mkdir()
+
+        new_django = self.django_version_newer_or_equal_than("4.0")
+        django_admin_executable = "django-admin" if new_django else "django-admin.py"
+
         subprocess.check_call([
-            str(Path(self.virtualenv.path) / 'bin/django-admin.py'),
-            'startproject',
-            'mysite',
+            str(Path(self.virtualenv.path) / "bin" / django_admin_executable),
+            "startproject",
+            "mysite",
             str(self.project_path),
         ])
 

tests/test_django_project.py

@@ -198,11 +198,13 @@ def test_uses_detect_if_django_version_not_specified(self, project_with_mock_vir
 class TestRunStartproject:
     def test_creates_folder(self, mock_subprocess, fake_home, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
+        project.virtualenv.get_version = Mock(return_value="1.0")
         project.run_startproject(nuke=False)
         assert (fake_home / "mydomain.com").is_dir()
 
-    def test_calls_startproject(self, mock_subprocess, fake_home, virtualenvs_folder):
+    def test_calls_startproject_for_older_django(self, mock_subprocess, fake_home, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
+        project.virtualenv.get_version = Mock(return_value="3.9")
         project.run_startproject(nuke=False)
         assert mock_subprocess.check_call.call_args == call(
             [
@@ -213,18 +215,34 @@ def test_calls_startproject(self, mock_subprocess, fake_home, virtualenvs_folder
             ]
         )
 
+
+    def test_calls_startproject_for_newer_django(self, mock_subprocess, fake_home, virtualenvs_folder):
+        project = DjangoProject("mydomain.com", "python.version")
+        project.virtualenv.get_version = Mock(return_value="4.0")
+        project.run_startproject(nuke=False)
+        assert mock_subprocess.check_call.call_args == call(
+            [
+                str(Path(project.virtualenv.path / "bin/django-admin")),
+                "startproject",
+                "mysite",
+                str(fake_home / "mydomain.com"),
+            ]
+        )
+
     def test_nuke_option_deletes_directory_first(self, mock_subprocess, fake_home, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
         (fake_home / project.domain).mkdir()
         old_file = fake_home / project.domain / "old_file.py"
         old_file.write_text("old stuff")
+        project.virtualenv.get_version = Mock(return_value="1.0")
 
         project.run_startproject(nuke=True)
 
         assert not old_file.exists()
 
     def test_nuke_option_handles_directory_not_existing(self, mock_subprocess, fake_home, virtualenvs_folder):
         project = DjangoProject("mydomain.com", "python.version")
+        project.virtualenv.get_version = Mock(return_value="1.0")
         project.run_startproject(nuke=True)  # should not raise