fix some issues encountered while setting up a py3 venv on vesper

.gitignore

@@ -7,3 +7,4 @@ node_modules/
 frontend/bundles/*
 *-stats.json
 browser/dist/
+.env

requirements.in

@@ -0,0 +1,34 @@
+argon2-cffi==16.2.0
+asn1crypto==0.24.0
+bcrypt==3.1.7
+beautifulsoup4==4.6.3
+certifi==2019.9.11
+cffi==1.14
+contextlib2==0.5.5
+cryptography==2.7
+Django>=2.0.0
+django-extensions>=1.9.9
+django-passwords==0.3.12
+django-webpack-loader==0.6.0
+djangorestframework
+djangorestframework-bulk
+fabric==2.5.0
+html5lib==1.0.1
+invoke==1.3.0
+ipaddress==1.0.22
+oauthlib
+paramiko==2.6.0
+pip-tools
+psycopg2-binary
+pycparser==2.17
+pycrypto==2.6.1
+PyNaCl==1.3.0
+python-dotenv
+pytz==2019.1
+requests
+requests-oauthlib
+sentry-sdk
+six==1.10.0
+typing==3.5.2.2
+urllib3
+webencodings==0.5.1

requirements.txt

@@ -1,36 +1,133 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile requirements.in
+#
 argon2-cffi==16.2.0
+    # via -r requirements.in
+asgiref==3.3.1
+    # via django
 asn1crypto==0.24.0
+    # via
+    #   -r requirements.in
+    #   cryptography
 bcrypt==3.1.7
+    # via
+    #   -r requirements.in
+    #   paramiko
 beautifulsoup4==4.6.3
+    # via -r requirements.in
 certifi==2019.9.11
-cffi==1.14
+    # via
+    #   -r requirements.in
+    #   requests
+    #   sentry-sdk
+cffi==1.14.0
+    # via
+    #   -r requirements.in
+    #   argon2-cffi
+    #   bcrypt
+    #   cryptography
+    #   pynacl
+chardet==4.0.0
+    # via requests
+click==7.1.2
+    # via pip-tools
 contextlib2==0.5.5
+    # via -r requirements.in
 cryptography==2.7
-Django>=2.0.0
-django-extensions==1.9.9
+    # via
+    #   -r requirements.in
+    #   paramiko
+django-extensions==3.1.1
+    # via -r requirements.in
 django-passwords==0.3.12
-django-simple-aes-field==0.1.3
+    # via -r requirements.in
 django-webpack-loader==0.6.0
-djangorestframework
-djangorestframework-bulk
+    # via -r requirements.in
+django==3.1.6
+    # via
+    #   -r requirements.in
+    #   django-passwords
+    #   djangorestframework
+    #   djangorestframework-bulk
+djangorestframework-bulk==0.2.1
+    # via -r requirements.in
+djangorestframework==3.12.2
+    # via
+    #   -r requirements.in
+    #   djangorestframework-bulk
 fabric==2.5.0
+    # via -r requirements.in
 html5lib==1.0.1
+    # via -r requirements.in
+idna==2.10
+    # via requests
 invoke==1.3.0
+    # via
+    #   -r requirements.in
+    #   fabric
 ipaddress==1.0.22
-oauthlib
+    # via -r requirements.in
+oauthlib==3.1.0
+    # via
+    #   -r requirements.in
+    #   requests-oauthlib
 paramiko==2.6.0
-psycopg2
+    # via
+    #   -r requirements.in
+    #   fabric
+pip-tools==5.5.0
+    # via -r requirements.in
+psycopg2-binary==2.8.6
+    # via -r requirements.in
 pycparser==2.17
+    # via
+    #   -r requirements.in
+    #   cffi
 pycrypto==2.6.1
-PyNaCl==1.3.0
+    # via -r requirements.in
+pynacl==1.3.0
+    # via
+    #   -r requirements.in
+    #   paramiko
+python-dotenv==0.15.0
+    # via -r requirements.in
 pytz==2019.1
-raven==6.9.0
-requests
-requests-oauthlib
-sentry-sdk
-SimpleAES
+    # via
+    #   -r requirements.in
+    #   django
+requests-oauthlib==1.3.0
+    # via -r requirements.in
+requests==2.25.1
+    # via
+    #   -r requirements.in
+    #   requests-oauthlib
+sentry-sdk==0.19.5
+    # via -r requirements.in
 six==1.10.0
-South==1.0.2
+    # via
+    #   -r requirements.in
+    #   argon2-cffi
+    #   bcrypt
+    #   cryptography
+    #   html5lib
+    #   pynacl
+sqlparse==0.4.1
+    # via django
 typing==3.5.2.2
-urllib3
+    # via -r requirements.in
+urllib3==1.26.3
+    # via
+    #   -r requirements.in
+    #   requests
+    #   sentry-sdk
 webencodings==0.5.1
+    # via
+    #   -r requirements.in
+    #   html5lib
+
+# The following packages are considered to be unsafe in a requirements file:
+# pip
+# setuptools

watershed/settings.py

@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 import os
 
+from dotenv import load_dotenv
+load_dotenv()
+
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 SECRET_KEY = os.getenv("WATERSHED_SECRET_KEY")
@@ -12,7 +15,6 @@ if DEBUG:
 else:
     ALLOWED_HOSTS = ["watershed.rocks"]
 
-
 INSTALLED_APPS = (
     "django.contrib.admin",
     "django.contrib.auth",
@@ -27,7 +29,6 @@ INSTALLED_APPS = (
     "rest_framework_bulk",
     "webpack_loader",
     "django_extensions",
-    "raven.contrib.django.raven_compat",
     # app
     "customauth.apps.CustomauthConfig",
     "api.apps.ApiConfig",
@@ -143,7 +144,7 @@ import subprocess  # noqa: E402
 release = subprocess.check_output("git rev-parse HEAD", shell=True)
 
 sentry_sdk.init(
-    dsn="https://69327d4caef74ac694a6a76e93c96524:a9698b5624fe450b90626dbee1746e92@sentry.io/274934",  # noqa: E501
+    dsn=os.getenv("SENTRY_DSN"),
     release=release,
     integrations=[DjangoIntegration()],
     environment=SENTRY_ENV,
@@ -180,34 +181,30 @@ LOGGING = {
             "class": "logging.StreamHandler",
             "formatter": "verbose",
         },
-        "sentry": {
-            "level": "ERROR",
-            "class": "raven.contrib.django.raven_compat.handlers.SentryHandler",
-        },
     },
     "loggers": {
         "django": {
-            "handlers": [default_handler, "mail_admins", "sentry"],
+            "handlers": [default_handler, "mail_admins"],
             "level": "ERROR",
             "propagate": True,
         },
         "watershed": {
-            "handlers": [default_handler, "sentry"],
+            "handlers": [default_handler],
             "level": "DEBUG",
             "propagate": False,
         },
         "api": {
-            "handlers": [default_handler, "sentry"],
+            "handlers": [default_handler],
             "level": "DEBUG",
             "propagate": True,
         },
         "rest_framework": {
-            "handlers": [default_handler, "sentry"],
+            "handlers": [default_handler],
             "level": "ERROR",
             "propagate": True,
         },
         "customauth": {
-            "handlers": [default_handler, "sentry"],
+            "handlers": [default_handler],
             "level": "DEBUG",
             "propagate": True,
         },