Merge branch 'master' into #201-django-allauth

# Conflicts:
#	Pipfile
#	Pipfile.lock

2 files changed, 3 insertions, 2 deletions

diff --git a/Pipfile b/Pipfile
index 62d006fe..c7d0d766 100644
--- a/Pipfile
+++ b/Pipfile
@@ -20,7 +20,7 @@ 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"}
 pyyaml = "~=5.1"
-pyuwsgi = "~=2.0"
+pyuwsgi = {version = "~=2.0", sys_platform = "!='win32'"}
 django-allauth = "~=0.40"
 
 [dev-packages]
diff --git a/manage.py b/manage.py
index a1057a17..d2996488 100755
--- a/manage.py
+++ b/manage.py
@@ -7,7 +7,6 @@ import time
 from typing import List
 
 import django
-import pyuwsgi
 from django.contrib.auth import get_user_model
 from django.core.management import call_command, execute_from_command_line
 
@@ -143,6 +142,8 @@ class SiteManager:
             call_command("runserver", "0.0.0.0:8000")
             return
 
+        import pyuwsgi
+
         # Run uwsgi for production server
         pyuwsgi.run(["--ini", "docker/uwsgi.ini"])