Merge branch 'django' into django+200/wiki

# Conflicts:
#	Pipfile
#	Pipfile.lock
#	pydis_site/apps/home/tests/test_app_basics.py
#	pydis_site/apps/home/urls.py
#	pydis_site/hosts.py
#	pydis_site/settings.py

1 files changed, 7 insertions, 1 deletions

diff --git a/Pipfile b/Pipfile
index 130fdb80..62eb84a2 100644
--- a/Pipfile
+++ b/Pipfile
@@ -5,7 +5,7 @@ verify_ssl = true
 
 [dev-packages]
 flake8 = "~=3.7.7"
-flake8-bandit = "~=2.1.0"
+flake8-bandit = "==1.0.2"
 flake8-bugbear = "~=19.3.0"
 flake8-import-order = "~=0.18.1"
 flake8-string-format = "~=0.2.3"
@@ -26,8 +26,14 @@ djangorestframework-bulk = "~=0.2.1"
 psycopg2-binary = "~=2.8"
 django-simple-bulma = ">=1.1.7,<2.0"
 django-crispy-bulma = ">=0.1.2,<2.0"
+requests = "~=2.21"
 wiki = "~=0.4.4"
 pygments = "~=2.3.1"
 
 [requires]
 python_version = "3.7"
+
+[scripts]
+makemigrations = "python manage.py makemigrations"
+django_shell = "python manage.py shell"
+test = "python manage.py test"