drops python 3.5

filiplajszczak · filiplajszczak · commit 50813f013b62 · 2020-05-22T17:36:52.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,21 +3,14 @@ sudo: false
 language: python
 
 python:
-  - 3.5
   - 3.6
   - 3.7
   - 3.8
 
-# tmp fix until travis gets python3.7
-dist: xenial
-sudo: true
-
 install:
   - pip install -r requirements.txt
   - pip install -e .
 
-
 script:
   - pytest
   - pytest --cov=pythonanywhere --cov=scripts --cov-fail-under=65
-  - pytest --mypy -m mypy
diff --git a/README.md b/README.md
@@ -1,24 +1,25 @@
 [![Build Status](https://travis-ci.org/pythonanywhere/helper_scripts.svg?branch=master)](https://travis-ci.org/pythonanywhere/helper_scripts)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-
+[![PyPI](https://img.shields.io/pypi/v/pythonanywhere)](https://pypi.org/project/pythonanywhere/)
+[![Downloads](https://pepy.tech/badge/pythonanywhere)](https://pepy.tech/project/pythonanywhere)
 
 # PythonAnywhere helper scripts
 
 These scripts are designed to be run from PythonAnywhere consoles
 
-
 ## Installing
 
+    pip3.6 install --user pythonanywhere
 
-    pip3.5 install --user pythonanywhere
-
-
+If there is no `python3.6` on your PythonAnywhere account, 
+you should contact [support@pythonanywhere.com](mailto:support@pythonanywhere.com) and ask for an upgrade. 
+    
 ## Contributing
 
 Pull requests are welcome!  You'll find tests in the [tests](tests) folder...
 
     # prep your dev environment
-    mkvirtualenv --python=python3.5 helper_scripts
+    mkvirtualenv --python=python3.6 helper_scripts
     pip install -r requirements.txt
     pip install -e .
 
diff --git a/pytest.ini b/pytest.ini
@@ -1,2 +1,5 @@
 [pytest]
 addopts = --tb=native
+markers =
+    slowtest: marks tests as one of slowest (deselect with '-m "not slowtest"')
+    tasks: marks test as one of realated to tasks
diff --git a/pythonanywhere/api/__init__.py b/pythonanywhere/api/__init__.py
@@ -3,6 +3,9 @@
 from pythonanywhere.api.base import AuthenticationError, PYTHON_VERSIONS, call_api, get_api_endpoint
 from pythonanywhere.api.webapp import Webapp
 
+## TODO PEP 562 __getattr__ should be used here to handle deprecation warnings nicely when we drop python 3.6.
+## See https://www.python.org/dev/peps/pep-0562/#id8
+
 warnings.warn(
     """
     Importing from pythonanywhere.api is deprecated in favor of 
diff --git a/pythonanywhere/api/base.py b/pythonanywhere/api/base.py
@@ -3,7 +3,7 @@
 import requests
 
 PYTHON_VERSIONS = {
-    "2.7": "python27", "3.4": "python34", "3.5": "python35", "3.6": "python36", "3.7": "python37", "3.8": "python38",
+    "3.6": "python36", "3.7": "python37", "3.8": "python38",
 }
 
 
diff --git a/pythonanywhere/snakesay.py b/pythonanywhere/snakesay.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3.5
+#!/usr/bin/env python3.6
 import sys
 import textwrap
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,24 +1,11 @@
-certifi==2019.3.9
-chardet==3.0.4
-cookies==2.2.1
-coverage==4.5.4
 docopt==0.6.2
-idna==2.8
-pbr==5.1.0
-psutil==5.4.0
-py==1.7.0
-pytest-cov==2.6.1
-pytest-mock==2.0.0
-pytest-mypy==0.4.2
-pytest==3.6.4
-python-dateutil==2.7.5
-requests==2.22.0
-responses==0.8.1
-schema==0.7.1
-six==1.11.0
-stevedore==1.30.0
-tabulate==0.8.6
-urllib3==1.25.2
-virtualenv-clone==0.4.0
-virtualenv==16.0.0
-virtualenvwrapper==4.8.2
+psutil==5.7.0
+pytest==5.4.2
+pytest-cov==2.8.1
+pytest-mock==3.1.0
+pytest-mypy==0.6.2
+requests==2.23.0
+responses==0.10.14
+schema==0.7.2
+tabulate==0.8.7
+virtualenvwrapper==4.8.4
diff --git a/scripts/pa_autoconfigure_django.py b/scripts/pa_autoconfigure_django.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Autoconfigure a Django project from on a github URL.
 
 - downloads the repo
@@ -12,7 +12,7 @@
 
 Options:
   --domain=<domain>         Domain name, eg www.mydomain.com   [default: your-username.pythonanywhere.com]
-  --python=<python-version> Python version, eg "2.7"    [default: 3.5]
+  --python=<python-version> Python version, eg "3.8"    [default: 3.6]
   --nuke                    *Irrevocably* delete any existing web app config on this domain. Irrevocably.
 """
 
diff --git a/scripts/pa_create_scheduled_task.py b/scripts/pa_create_scheduled_task.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Create a scheduled task.
 
 Two categories of tasks are available: daily and hourly.
diff --git a/scripts/pa_create_webapp_with_virtualenv.py b/scripts/pa_create_webapp_with_virtualenv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Create a web app with a virtualenv
 
 - creates a simple hello world web app
@@ -11,7 +11,7 @@
 
 Options:
   --domain=<domain>         Domain name, eg www.mydomain.com   [default: your-username.pythonanywhere.com]
-  --python=<python-version> Python version, eg "2.7"    [default: 3.6]
+  --python=<python-version> Python version, eg "3.8"    [default: 3.6]
   --nuke                    *Irrevocably* delete any existing web app config on this domain. Irrevocably.
 """
 
diff --git a/scripts/pa_delete_scheduled_task.py b/scripts/pa_delete_scheduled_task.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Delete scheduled task(s) by id or nuke'em all.
 
 Usage:
diff --git a/scripts/pa_delete_webapp_logs.py b/scripts/pa_delete_webapp_logs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Deletes webapp logs.
 
 - gets list of logs via api
diff --git a/scripts/pa_get_scheduled_task_specs.py b/scripts/pa_get_scheduled_task_specs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Get current scheduled task's specs file by task id.
 
 Available specs are: command, enabled, interval, hour, minute, printable-time,
diff --git a/scripts/pa_get_scheduled_tasks_list.py b/scripts/pa_get_scheduled_tasks_list.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Get list of user's scheduled tasks as a table with columns:
 id, interval, at (hour:minute/minute past), status (enabled/disabled), command.
 
diff --git a/scripts/pa_install_webapp_letsencrypt_ssl.py b/scripts/pa_install_webapp_letsencrypt_ssl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Set the HTTPS certificate and private key for a website, assuming that these have been generated by the dehydrated
 script that gets them from Let's Encrypt, and that they're in the standard place.  This script should normally only
 be run on PythonAnywhere.
diff --git a/scripts/pa_install_webapp_ssl.py b/scripts/pa_install_webapp_ssl.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Set the HTTPS certificate and private key for a website to the contents of two files, and reload the site.
 
 Usage:
diff --git a/scripts/pa_reload_webapp.py b/scripts/pa_reload_webapp.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Reloads the given site
 
 Usage:
diff --git a/scripts/pa_start_django_webapp_with_virtualenv.py b/scripts/pa_start_django_webapp_with_virtualenv.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Create a new Django webapp with a virtualenv.  Defaults to
 your free domain, the latest version of Django and Python 3.6
 
diff --git a/scripts/pa_update_scheduled_task.py b/scripts/pa_update_scheduled_task.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3.5
+#!/usr/bin/python3.6
 """Update a scheduled task using id and proper specs.
 
 Note that logfile name will change after updating the task but it won't be
diff --git a/setup.py b/setup.py
@@ -25,13 +25,12 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.6",
-        "Programming Language :: Python :: 3.5",
     ],
     keywords="pythonanywhere api cloud web hosting",
     packages=["pythonanywhere", "pythonanywhere.api"],
     install_requires=["docopt", "python-dateutil", "requests", "schema", "tabulate"],
     extras_require={},
-    python_requires=">=3.5",
+    python_requires=">=3.6",
     package_data={},
     data_files=[],
     entry_points={},
diff --git a/tests/test_api_webapp.py b/tests/test_api_webapp.py
@@ -90,13 +90,13 @@ def test_does_post_to_create_webapp(self, api_responses, api_token):
         api_responses.add(responses.PATCH, expected_patch_url, status=200)
 
         Webapp("mydomain.com").create(
-            "2.7", "/virtualenv/path", "/project/path", nuke=False
+            "3.7", "/virtualenv/path", "/project/path", nuke=False
         )
 
         post = api_responses.calls[0]
         assert post.request.url == expected_post_url
         assert post.request.body == urlencode(
-            {"domain_name": "mydomain.com", "python_version": PYTHON_VERSIONS["2.7"]}
+            {"domain_name": "mydomain.com", "python_version": PYTHON_VERSIONS["3.7"]}
         )
         assert post.request.headers["Authorization"] == "Token {api_token}".format(
             api_token=api_token
@@ -121,7 +121,7 @@ def test_does_patch_to_update_virtualenv_path_and_source_directory(
         api_responses.add(responses.PATCH, expected_patch_url, status=200)
 
         Webapp("mydomain.com").create(
-            "2.7", "/virtualenv/path", "/project/path", nuke=False
+            "3.7", "/virtualenv/path", "/project/path", nuke=False
         )
 
         patch = api_responses.calls[1]
@@ -143,7 +143,7 @@ def test_raises_if_post_does_not_20x(self, api_responses, api_token):
 
         with pytest.raises(Exception) as e:
             Webapp("mydomain.com").create(
-                "2.7", "/virtualenv/path", "/project/path", nuke=False
+                "3.7", "/virtualenv/path", "/project/path", nuke=False
             )
 
         assert "POST to create webapp via API failed" in str(e.value)
@@ -170,7 +170,7 @@ def test_raises_if_post_returns_a_200_with_status_error(
 
         with pytest.raises(Exception) as e:
             Webapp("mydomain.com").create(
-                "2.7", "/virtualenv/path", "/project/path", nuke=False
+                "3.7", "/virtualenv/path", "/project/path", nuke=False
             )
 
         assert "POST to create webapp via API failed" in str(e.value)
@@ -199,7 +199,7 @@ def test_raises_if_patch_does_not_20x(self, api_responses, api_token):
 
         with pytest.raises(Exception) as e:
             Webapp("mydomain.com").create(
-                "2.7", "/virtualenv/path", "/project/path", nuke=False
+                "3.7", "/virtualenv/path", "/project/path", nuke=False
             )
 
         assert (
@@ -223,7 +223,7 @@ def test_does_delete_first_for_nuke_call(self, api_responses, api_token):
         api_responses.add(responses.PATCH, webapp_url, status=200)
 
         Webapp("mydomain.com").create(
-            "2.7", "/virtualenv/path", "/project/path", nuke=True
+            "3.7", "/virtualenv/path", "/project/path", nuke=True
         )
 
         delete = api_responses.calls[0]
@@ -248,7 +248,7 @@ def test_ignores_404_from_delete_call_when_nuking(self, api_responses, api_token
         api_responses.add(responses.PATCH, webapp_url, status=200)
 
         Webapp("mydomain.com").create(
-            "2.7", "/virtualenv/path", "/project/path", nuke=True
+            "3.7", "/virtualenv/path", "/project/path", nuke=True
         )
 
 
diff --git a/tests/test_pa_autoconfigure_django.py b/tests/test_pa_autoconfigure_django.py
@@ -1,3 +1,4 @@
+from platform import python_version
 from unittest.mock import call, patch
 import os
 import pytest
@@ -33,14 +34,15 @@ def test_calls_all_stuff_in_right_order(self):
     def test_actually_works_against_example_repo(
         self, fake_home, virtualenvs_folder, api_token, process_killer
     ):
-        repo = 'https://github.com/hjwp/example-django-project.git'
+        running_python_version = ".".join(python_version().split(".")[:2])
+        repo = 'https://github.com/pythonanywhere/example-django-project.git'
         domain = 'mydomain.com'
         with patch('scripts.pa_autoconfigure_django.DjangoProject.update_wsgi_file'):
             with patch('scripts.pa_autoconfigure_django.DjangoProject.start_bash'):
                 with patch('pythonanywhere.api.webapp.call_api'):
-                    main(repo, domain, '2.7', nuke=False)
+                    main(repo, domain, running_python_version, nuke=False)
 
-        expected_django_version = '1.11.1'
+        expected_django_version = '3.0.6'
         expected_virtualenv = virtualenvs_folder / domain
         expected_project_path = fake_home / domain
         django_project_name = 'myproject'
@@ -56,7 +58,7 @@ def test_actually_works_against_example_repo(
         with expected_settings_path.open() as f:
             lines = f.read().split('\n')
         assert "MEDIA_ROOT = os.path.join(BASE_DIR, 'media')" in lines
-        assert "ALLOWED_HOSTS = ['mydomain.com']" in lines
+        assert "ALLOWED_HOSTS = ['mydomain.com']  # type: List[str]" in lines
 
         assert 'base.css' in os.listdir(str(fake_home / domain / 'static/admin/css'))
         server = subprocess.Popen([
diff --git a/tests/test_pa_start_django_webapp_with_virtualenv.py b/tests/test_pa_start_django_webapp_with_virtualenv.py
@@ -29,10 +29,10 @@ def test_calls_all_stuff_in_right_order(self):
     def test_actually_creates_django_project_in_virtualenv_with_hacked_settings_and_static_files(
         self, fake_home, virtualenvs_folder, api_token
     ):
-
+        running_python_version = ".".join(python_version().split(".")[:2])
         with patch("scripts.pa_start_django_webapp_with_virtualenv.DjangoProject.update_wsgi_file"):
             with patch("pythonanywhere.api.webapp.call_api"):
-                main("mydomain.com", "1.9.2", "2.7", nuke=False)
+                main("mydomain.com", "2.2.12", running_python_version, nuke=False)
 
         django_version = (
             subprocess.check_output(
@@ -44,7 +44,7 @@ def test_actually_creates_django_project_in_virtualenv_with_hacked_settings_and_
             .decode()
             .strip()
         )
-        assert django_version == "1.9.2"
+        assert django_version == "2.2.12"
 
         with (fake_home / "mydomain.com/mysite/settings.py").open() as f:
             lines = f.read().split("\n")
@@ -59,12 +59,8 @@ 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.webapp.call_api"):
                 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"
+                old_django_version = "2.2.12"
+                new_django_version = "3.0.6"
 
                 main("mydomain.com", old_django_version, running_python_version, nuke=False)
                 main("mydomain.com", new_django_version, running_python_version, nuke=True)
diff --git a/tests/test_virtualenvs.py b/tests/test_virtualenvs.py

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`import requests`
`4`	`4`
`5`	`5`	`PYTHON_VERSIONS = {`
`6`		`- "2.7": "python27", "3.4": "python34", "3.5": "python35", "3.6": "python36", "3.7": "python37", "3.8": "python38",`
	`6`	`+ "3.6": "python36", "3.7": "python37", "3.8": "python38",`
`7`	`7`	`}`
`8`	`8`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python3.5`
	`1`	`+#!/usr/bin/env python3.6`
`2`	`2`	`import sys`
`3`	`3`	`import textwrap`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/python3.5`
	`1`	`+#!/usr/bin/python3.6`
`2`	`2`	`"""Create a scheduled task.`
`3`	`3`
`4`	`4`	`Two categories of tasks are available: daily and hourly.`