switch to being all about autoconfigure-django for now

hjwp · hjwp · commit 34f42ee127d0 · 2017-10-16T01:48:46.000+01:00
diff --git a/scripts/pa_autoconfigure_django.py b/scripts/pa_autoconfigure_django.py
@@ -1,14 +1,14 @@
 #!/usr/bin/python3.6
-"""Autoconfigure a web app based on a github URL.
+"""Autoconfigure a Django project from on a github URL.
 
 - downloads the repo
-- detects a requirements.txt and installs it into a virtualenv
-- autodetects django / flask and creates wsgi configuration for them
+- creates a virtualenv and installs django (or detects a requirements.txt if available)
+- creates webapp via api
+- creates django wsgi configuration file
 - adds static files config
-- adds placeholders for any detected environment variables
 
 Usage:
-  pa_autoconfigure_webapp.py <git-repo-url> [--domain=<domain> --python=<python-version>] [--nuke]
+  pa_autoconfigure_django.py <git-repo-url> [--domain=<domain> --python=<python-version>] [--nuke]
 
 Options:
   --domain=<domain>         Domain name, eg www.mydomain.com   [default: your-username.pythonanywhere.com]
diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
     entry_points={},
     scripts=[
         'scripts/pa_start_django_webapp_with_virtualenv.py',
-        'scripts/pa_autoconfigure_webapp.py',
+        'scripts/pa_autoconfigure_django.py',
         'pythonanywhere/snakesay.py',
     ]
 )
diff --git a/tests/test_pa_autoconfigure_django.py b/tests/test_pa_autoconfigure_django.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 import pytest
 
-from scripts.pa_autoconfigure_webapp import main, download_repo
+from scripts.pa_autoconfigure_django import main, download_repo
 
 
 @pytest.fixture
@@ -23,7 +23,7 @@ def mock_main_functions():
     for function in functions:
         mock = getattr(mocks, function)
         patcher = patch(
-            'scripts.pa_autoconfigure_webapp.{}'.format(function),
+            'scripts.pa_autoconfigure_django.{}'.format(function),
             mock
         )
         patchers.append(patcher)
@@ -71,7 +71,7 @@ def test_domain_defaults_to_using_current_username(self, mock_main_functions):
 
 
     def test_lowercases_username(self, mock_main_functions):
-        with patch('scripts.pa_autoconfigure_webapp.getpass') as mock_getpass:
+        with patch('scripts.pa_autoconfigure_django.getpass') as mock_getpass:
             mock_getpass.getuser.return_value = 'UserName1'
             main('a-url', 'your-username.pythonanywhere.com', 'python.version', 'nukey')
             assert mock_main_functions.sanity_checks.call_args == call(

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`entry_points={},`
`39`	`39`	`scripts=[`
`40`	`40`	`'scripts/pa_start_django_webapp_with_virtualenv.py',`
`41`		`- 'scripts/pa_autoconfigure_webapp.py',`
	`41`	`+ 'scripts/pa_autoconfigure_django.py',`
`42`	`42`	`'pythonanywhere/snakesay.py',`
`43`	`43`	`]`
`44`	`44`	`)`