836 Django 2.0 Upgrade (#840)

* Dependency updates

* Updated pipfile

* Flake8 cleanup

Pipfile

@@ -4,25 +4,24 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = "==1.11.*"
+django = "~=2.0"
 dj-database-url = "*"
 gevent = "*"
 gunicorn = "*"
 whitenoise = "*"
-djangorestframework = "==3.6.*"
+djangorestframework = "~=3.8"
 djangorestframework-csv = "*"
 bleach = "*"
 newrelic = "*"
 cfenv = "*"
 cg-django-uaa = "*"
 "psycopg2-binary" = "*"
 markdown = "*"
-django-webtest = "==1.9.2"
+django-webtest = "~=1.9"
 
 [dev-packages]
 bandit = "*"
 coverage = "*"
-django = "==1.11.*"
 django-debug-toolbar = "*"
 django-webtest = "*"
 factory-boy = "*"
@@ -31,4 +30,4 @@ nplusone = "*"
 codecov = "*"
 
 [requires]
-python_version = "3.6"
+python_version = "3.6"

docs/local-development.md

@@ -85,6 +85,17 @@ container: `Control + p, Control + q`, one after another.
 If you mistakenly hit `Control + c`, you will kill the `tock_app` container! In
 that case, restart the `tock_app` container with a `docker-compose up` command.
 
+
+### Testing locally
+
+The easiest, most reliable way to test locally is from within the docker container, 
+which lets you access `manage.py`:
+
+```
+docker-compose run app bash
+python manage.py test
+```
+
 ### Making CSS changes
 
 `docker-compose up` will also launch a [Node] machine that compiles the [Sass]