Merge branch 'master' into admin-api-pages-improvements

# Conflicts:
#	pydis_site/apps/api/admin.py

1 files changed, 21 insertions, 21 deletions

diff --git a/Pipfile b/Pipfile
index c7d0d766..d23d28e6 100644
--- a/Pipfile
+++ b/Pipfile
@@ -4,48 +4,48 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [packages]
-django = "~=2.2"
-django-crispy-forms = "~=1.7.2"
+django = "~=3.0.4"
 django-environ = "~=0.4.5"
 django-filter = "~=2.1.0"
-django-hosts = "~=3.0"
-djangorestframework = "~=3.9.2"
+django-hosts = "~=4.0"
+djangorestframework = "~=3.11.0"
 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"
-whitenoise = "==4.1.2"
+django-simple-bulma = "~=1.2"
+whitenoise = "~=5.0"
 requests = "~=2.21"
 pygments = "~=2.3.1"
-#wiki = {git = "https://github.com/python-discord/django-wiki.git"}
-wiki = {path = "./docker/wheels/wiki-0.5.dev20190420204942-py3-none-any.whl"}
+wiki = "~=0.6.0"
 pyyaml = "~=5.1"
 pyuwsgi = {version = "~=2.0", sys_platform = "!='win32'"}
-django-allauth = "~=0.40"
+django-allauth = "~=0.41"
+sentry-sdk = "~=0.14"
+gitpython = "~=3.1.7"
 
 [dev-packages]
-coverage = "~=4.5.3"
+coverage = "~=5.0"
 flake8 = "~=3.7"
-flake8-annotations = "~=1.0"
-flake8-bandit = "==1.0.2"
-flake8-bugbear = "~=19.8"
-flake8-docstrings = "~=1.4"
+flake8-annotations = "~=2.0"
+flake8-bandit = "~=2.1"
+flake8-bugbear = "~=20.1"
+flake8-docstrings = "~=1.5"
 flake8-import-order = "~=0.18"
-flake8-string-format = "~=0.2"
-flake8-tidy-imports = "~=2.0"
+flake8-string-format = "~=0.3"
+flake8-tidy-imports = "~=4.0"
 flake8-todo = "~=0.7"
 mccabe = "~=0.6.1"
-pep8-naming = "~=0.8.2"
-pre-commit = "~=1.18"
-unittest-xml-reporting = "~=2.5.1"
+pep8-naming = "~=0.9"
+pre-commit = "~=2.1"
+unittest-xml-reporting = "~=3.0"
 
 [requires]
 python_version = "3.7"
 
 [scripts]
+start = "python manage.py run --debug"
 makemigrations = "python manage.py makemigrations"
 django_shell = "python manage.py shell"
 test = "coverage run manage.py test"
 report = "coverage report -m"
-lint = "flake8"
+lint = "pre-commit run --all-files"
 precommit = "pre-commit install"