copy wsgi file after creating web app

Author: copelco

README.md

@@ -10,11 +10,10 @@ yet recommended for actual deployments yet.
 
 ## Motivation
 
-This plugin is motivated by the desire to provide a deployment option for
-`django-simple-deploy` that doesn't require a credit card to get started.
-PythonAnywhere offers a free tier that allows users to deploy small Django apps
-and may be a helpful way to get small Django apps online without financial
-commitment.
+This plugin hopes to provide a deployment option for `django-simple-deploy` that
+doesn't require a credit card to get started. PythonAnywhere offers a free tier
+that allows users to deploy small Django apps and may be a helpful way to get
+small Django apps online without financial commitment.
 
 ## Quickstart
 
@@ -28,7 +27,7 @@ requires a few prerequisites:
   which is a limited account with one web app, but requires no credit card.
 - Generate an [API token](https://help.pythonanywhere.com/pages/GettingYourAPIToken)
 - Ideally, stay logged in to PythonAnywhere in your default browser to make the
-  first deployment smoother.
+  deployment smoother.
 
 ## Plugin Development
 

dsd_pythonanywhere/platform_deployer.py

@@ -143,30 +143,42 @@ def _prep_automate_all(self):
         """Take any further actions needed if using automate_all."""
         pass
 
-    def _clone_and_run_setup_script(self):
+    def _clone_and_run_setup_script(self, repo_name: str):
         # Run the setup script to clone repo and install dependencies
         cmd = [f"curl -fsSL {REMOTE_SETUP_SCRIPT_URL} | bash -s --"]
         origin_url = self._get_origin_url()
-        repo_name = self._get_repo_name()
         django_project_name = dsd_config.local_project_name
         cmd.append(f"{origin_url} {repo_name} {django_project_name}")
         cmd = " ".join(cmd)
         plugin_utils.write_output(f"  Cloning and running setup script: {cmd}")
         self.client.run_command(cmd)
         plugin_utils.write_output("Done cloning and running setup script.")
-        # Finally, create the webapp
-        self._create_webapp(client=self.client, repo_name=repo_name)
 
-    def _create_webapp(self, client: PythonAnywhereClient, repo_name: str):
+    def _copy_wsgi_file(self, repo_name: str):
+        """Copy wsgi.py to PythonAnywhere's wsgi location.
+
+        This must be done after webapp creation, as creating a webapp
+        overwrites the wsgi file.
+        """
+        plugin_utils.write_output("  Copying wsgi.py to PythonAnywhere...")
+
+        django_project_name = dsd_config.local_project_name
+        domain = f"{self.client.username}.pythonanywhere.com"
+        wsgi_dest = f"/var/www/{domain.replace('.', '_')}_wsgi.py"
+        wsgi_src = f"{repo_name}/{django_project_name}/wsgi.py"
+
+        cmd = f"cp {wsgi_src} {wsgi_dest}"
+        self.client.run_command(cmd)
+        plugin_utils.write_output(f"  Copied {wsgi_src} to {wsgi_dest}")
+
+    def _create_webapp(self, repo_name: str):
         """Create the webapp on PythonAnywhere."""
         plugin_utils.write_output("  Creating webapp on PythonAnywhere...")
-
         # Paths on PythonAnywhere (remote home directory)
-        remote_home = Path(f"/home/{client.username}")
+        remote_home = Path(f"/home/{self.client.username}")
         project_path = remote_home / repo_name
         virtualenv_path = remote_home / "venv"
-
-        client.create_or_update_webapp(
+        self.client.create_or_update_webapp(
             python_version="3.13",
             virtualenv_path=virtualenv_path,
             project_path=project_path,
@@ -232,10 +244,10 @@ def _conclude_automate_all(self):
 
         # Push project.
         plugin_utils.write_output("  Deploying to PythonAnywhere...")
-
-        # Should set self.deployed_url, which will be reported in the success message.
-        self._clone_and_run_setup_script()
-
+        repo_name = self._get_repo_name()
+        self._clone_and_run_setup_script(repo_name=repo_name)
+        self._create_webapp(repo_name=repo_name)
+        self._copy_wsgi_file(repo_name=repo_name)
         self.deployed_url = f"https://{self._get_deployed_project_name()}.pythonanywhere.com"
 
     def _show_success_message(self):

pyproject.toml

@@ -9,7 +9,7 @@ description = "A plugin for django-simple-deploy, supporting deployments to Pyth
 readme = "README.md"
 
 authors = [
-    {name = "Eric Matthes", email = "ehmatthes@gmail.com" },
+    {name = "Caktus Consulting Group", email = "solutions@caktusgroup.com" },
 ]
 
 classifiers = [

scripts/setup.sh

@@ -2,15 +2,14 @@
 set -e
 
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
-	echo "Usage: $0 <git-repo-url> <directory-name> <django-project-name> [python-version] [wsgi-dest-prefix]"
+	echo "Usage: $0 <git-repo-url> <directory-name> <django-project-name> [python-version]"
 	exit 1
 fi
 
 GIT_REPO_URL=$1
 REPO_NAME=$2
 DJANGO_PROJECT_NAME=$3
 PYTHON_VERSION=${4:-python3.13}
-WSGI_DEST_PREFIX=${5:-/var/www}
 
 # Clone the repository from the provided Git URL
 
@@ -56,15 +55,4 @@ else
 	echo ".env file already exists. Skipping creation."
 fi
 
-# Copy wsgi.py to PythonAnywhere's wsgi location
-USERNAME=$(whoami)
-DOMAIN="${USERNAME}.pythonanywhere.com"
-WSGI_DEST="${WSGI_DEST_PREFIX}/${DOMAIN//./_}_wsgi.py"
-WSGI_SRC="$REPO_NAME/$DJANGO_PROJECT_NAME/wsgi.py"
-
-echo "Copying WSGI file from $WSGI_SRC to $WSGI_DEST..."
-mkdir -p "$WSGI_DEST_PREFIX"
-cp "$WSGI_SRC" "$WSGI_DEST"
-echo "WSGI file copied."
-
 echo "Setup complete!!!"

tests/integration_tests/test_setup_script.py

@@ -1,14 +1,11 @@
-"""Integration tests for the PythonAnywhere setup.sh script."""
+"""Basic happy path tests for the PythonAnywhere setup.sh script."""
 
-import getpass
 import subprocess
 import sys
 from pathlib import Path
 
 import pytest
 
-# --- Fixtures ---
-
 
 @pytest.fixture(scope="module")
 def setup_script_result(tmp_path_factory) -> dict:
@@ -19,8 +16,6 @@ def setup_script_result(tmp_path_factory) -> dict:
     django_project_name = "mysite"
     # Use the current Python version available on CI for testing
     python_version = f"python{sys.version_info.major}.{sys.version_info.minor}"
-    # Use a temp directory for WSGI destination prefix
-    wsgi_dest_prefix = tmp_path / "var_www"
 
     # Create a minimal git repository with a requirements.txt file and Django project
     source_repo = tmp_path / "source_repo"
@@ -42,9 +37,7 @@ def setup_script_result(tmp_path_factory) -> dict:
         check=True,
         capture_output=True,
     )
-
     repo_url = source_repo.as_uri()
-
     result = subprocess.run(
         [
             "bash",
@@ -53,7 +46,6 @@ def setup_script_result(tmp_path_factory) -> dict:
             dir_name,
             django_project_name,
             python_version,
-            str(wsgi_dest_prefix),
         ],
         cwd=tmp_path,
         check=True,
@@ -67,13 +59,9 @@ def setup_script_result(tmp_path_factory) -> dict:
         "venv_path": tmp_path / "venv",
         "project_path": tmp_path / dir_name,
         "django_project_name": django_project_name,
-        "wsgi_dest_prefix": wsgi_dest_prefix,
     }
 
 
-# --- Test setup.sh script ---
-
-
 def test_setup_script_creates_venv(setup_script_result):
     """setup.sh creates a virtual environment."""
     assert setup_script_result["result"].returncode == 0
@@ -104,15 +92,3 @@ def test_setup_script_creates_env_file(setup_script_result):
         if line.startswith("SECRET_KEY="):
             secret_key = line.split("=", 1)[1]
             assert len(secret_key) == 50
-
-
-def test_setup_script_copies_wsgi_file(setup_script_result):
-    """setup.sh copies WSGI file to the destination prefix."""
-    username = getpass.getuser()
-    domain = f"{username}.pythonanywhere.com"
-    wsgi_filename = f"{domain.replace('.', '_')}_wsgi.py"
-    wsgi_dest = setup_script_result["wsgi_dest_prefix"] / wsgi_filename
-
-    assert "WSGI file copied." in setup_script_result["result"].stdout
-    assert wsgi_dest.exists()
-    assert "DJANGO_SETTINGS_MODULE" in wsgi_dest.read_text()