make gevent and psycog work for m2

admin/base/wsgi.py

@@ -6,15 +6,6 @@
 For more information on this file, see
 https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
 """
-from website import settings
-
-if not settings.DEBUG_MODE:
-    from gevent import monkey
-    monkey.patch_all()
-    # PATCH: avoid deadlock on getaddrinfo, this patch is necessary while waiting for
-    # the final gevent 1.1 release (https://github.com/gevent/gevent/issues/349)
-    #  'foo'.encode('idna')  # noqa
-
 import os  # noqa
 from django.core.wsgi import get_wsgi_application  # noqa
 from website.app import init_app  # noqa

api/base/wsgi.py

@@ -6,16 +6,8 @@
 For more information on this file, see
 https://docs.djangoproject.com/en/1.8/howto/deployment/wsgi/
 """
-from website import settings
 from api.base import settings as api_settings
 
-if not settings.DEBUG_MODE:
-    from gevent import monkey
-    monkey.patch_all()
-    # PATCH: avoid deadlock on getaddrinfo, this patch is necessary while waiting for
-    # the final gevent 1.1 release (https://github.com/gevent/gevent/issues/349)
-    #  'foo'.encode('idna')  # noqa
-
 import os  # noqa
 from django.core.wsgi import get_wsgi_application  # noqa
 from website.app import init_app  # noqa

main.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-from gevent import monkey
-monkey.patch_all()
 
 # PATCH: avoid deadlock on getaddrinfo, this patch is necessary while waiting for
 # the final gevent 1.1 release (https://github.com/gevent/gevent/issues/349)

requirements.txt

@@ -9,7 +9,6 @@ future==0.18.2
 invoke==0.15.0
 Werkzeug==1.0.0
 Flask==1.0
-gevent==1.2.2
 Mako==1.0.7
 Markdown==3.3.7
 WTForms==1.0.4
@@ -82,7 +81,7 @@ django-storages==1.6.6
 google-cloud-storage==0.22.0  # dependency of django-storages, hard-pin to version
 django-dirtyfields==1.3.1
 django-extensions==3.2.0
-psycopg2==2.7.3 --no-binary psycopg2
+psycopg2-binary==2.9.7
 django-bulk-update==2.2.0
 
 # Reviews requirements