Merge branch 'release/2020-08-06'

mozilla · Aug 6, 2020 · 2de48d9 · 2de48d9
2 parents 465e1f9 + c21438e
commit 2de48d9
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -39,3 +39,4 @@ This software is licensed under the [Mozilla Public License Version 2.0][MPL]. F
 information, read the file ``LICENSE``.
 
 [MPL]: http://www.mozilla.org/MPL/
+
diff --git a/apps/elmo_queues/tests.py b/apps/elmo_queues/tests.py
@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import mock
 import os
 import shutil
 import tempfile
+from unittest import mock
 
 import hglib
 

diff --git a/apps/pushes/tests/test_pushes.py b/apps/pushes/tests/test_pushes.py
@@ -5,8 +5,8 @@
 from __future__ import unicode_literals
 
 import datetime
-import mock
 import time
+from unittest import mock
 from elmo.test import TestCase
 from django.urls import reverse
 import hglib

diff --git a/elmo/settings/__init__.py b/elmo/settings/__init__.py
@@ -6,6 +6,8 @@
 
 import os
 import markus
+import sentry_sdk
+from sentry_sdk.integrations.django import DjangoIntegration
 
 from .base import *  # noqa
 # we modify that later, explicitly import
@@ -77,9 +79,10 @@
     }
 
 if 'ELMO_SENTRY_DSN' in os.environ:
-    RAVEN_CONFIG = {
-        'dsn': os.environ['ELMO_SENTRY_DSN']
-    }
+    sentry_sdk.init(
+        dsn=os.environ['ELMO_SENTRY_DSN'],
+        integrations=[DjangoIntegration()],
+    )
 
 if 'ELMO_INCLUDE_ANALYTICS' in os.environ:
     INCLUDE_ANALYTICS = True

diff --git a/elmo/settings/base.py b/elmo/settings/base.py
@@ -86,9 +86,6 @@
 
     'elmo',
 
-    # Local apps
-    'raven.contrib.django.raven_compat',
-
     # Third-party apps
     'whitenoise.runserver_nostatic',
 

diff --git a/elmo/settings/local.py-dist b/elmo/settings/local.py-dist
@@ -2,15 +2,16 @@
 # Copy it and add your local settings here.
 
 # example of overriding installed apps
+# from .base import INSTALLED_APPS, MIDDLEWARE
 # INSTALLED_APPS = INSTALLED_APPS + ('django_extensions', 'debug_toolbar')
-if 'debug_toolbar' in INSTALLED_APPS:
-    MIDDLEWARE_CLASSES = (
-        ('debug_toolbar.middleware.DebugToolbarMiddleware',) +
-        MIDDLEWARE_CLASSES
-        )
-    INTERNAL_IPS = [
-        '127.0.0.1'
-    ]
+# if 'debug_toolbar' in INSTALLED_APPS:
+#     MIDDLEWARE = (
+#         ('debug_toolbar.middleware.DebugToolbarMiddleware',) +
+#         MIDDLEWARE
+#         )
+#     INTERNAL_IPS = [
+#         '127.0.0.1'
+#     ]
 
 # You must set this to something different and unique
 SECRET_KEY = ''
@@ -52,11 +53,6 @@ SESSION_COOKIE_SECURE = False
 # Uncomment to use local auth backend.
 # OIDC_DISABLE = True
 
-# if you want to test the Sentry (https://sentry.prod.mozaws.net/operations)
-#RAVEN_CONFIG = {
-#    'dsn': ''  # see https://sentry.prod.mozaws.net/operations
-#}
-
 # Feed for example, to avoid having to do a HTTP call for the feed use:
 #L10N_FEED_URL = 'file://' + os.path.abspath('apps/homepage/test_rss20.xml')
 

diff --git a/lib/auth/tests.py b/lib/auth/tests.py
@@ -5,7 +5,7 @@
 from __future__ import absolute_import
 from __future__ import unicode_literals
 
-from mock import patch
+from unittest.mock import patch
 
 from elmo.test import TestCase
 from django.contrib.auth.models import Group

diff --git a/requirements/constraints.txt b/requirements/constraints.txt
@@ -5,39 +5,32 @@
 # >=0.13 josepy
 PyOpenSSL==19.1.0
 # amqp>=2.6.0,<2.7 kombu
-amqp==2.6.0
+amqp==2.6.1
 # >=2017.4.17 requests
-certifi==2020.4.5.2
+# sentry-sdk
+certifi==2020.6.20
 # >=1.8,!=1.11.3 cryptography
-cffi==1.14.0
+cffi==1.14.1
 # <4,>=3.0.2 requests
 chardet==3.0.4
-# raven
-contextlib2==0.6.0.post1
 # mozilla-django-oidc
 # >=0.8 josepy
 # >=2.3 PyOpenSSL
-cryptography==2.9.2
+cryptography==3.0
 # markus
-datadog==0.36.0
+datadog==0.38.0
 # >=3.3.2 datadog
 decorator==4.4.2
 # >=1.0.3 django-compressor
-django-appconf==1.0.3
+django-appconf==1.0.4
 # >=0.3 stastistics
 docutils==0.15.2
-# cryptography
-enum34==1.1.6
 # >=0.17.0, <0.18 compare-locales
 fluent.syntax==0.17.0
-# >=1 mock
-funcsigs==1.0.2
 # <3,>=2.5 requests
-idna==2.8
+idna==2.10
 # >=0.18 kombu
-importlib-metadata==1.6.1
-# cryptography
-ipaddress==1.0.23
+importlib-metadata==1.7.0
 # mozilla-django-oidc
 josepy==1.3.0
 # bleach
@@ -47,25 +40,29 @@ pycparser==2.20
 # >=2.0.2 packaging
 pyparsing==2.4.7
 # compare-locales
-pytoml==0.1.20
+pytoml==0.1.21
 # Django
-pytz==2019.3
+pytz==2020.1
 # ==1.0.6 django-compressor
 rcssmin==1.0.6
 # mozilla-django-oidc
 # >=2.6.0 datadog
-requests==2.23.0
+requests==2.24.0
 # ==1.1.0 django-compressor
 rjsmin==1.1.0
 # bleach, compare-locales, markus
 # >=1.4.0 python-memcached
 # >=1.4.1 cryptography
-# >=1.9 bleach, html5lib, mock
+# >=1.9 bleach, html5lib
 # >= 1.12.0 django-compressor
 six==1.15.0
+# >= 0.2.2 Django
+# >=0.2.0 django-debug-toolbar
+sqlparse==0.3.1
 # markus
 statistics==1.0.3.5
 # 1.21.1,<1.26,!=1.25.0,!=1.25.1 requests
+# >=1.10.0 sentry-sdk
 # <2.0,>=1.8 elasticsearch
 # Downgrade for https://github.com/elastic/elasticsearch-py/issues/943
 # Only fixed in elasticsearch 7.0.5
@@ -79,9 +76,3 @@ zipp==3.1.0
 
 
 ## dev
-
-# >=0.2.0 django-debug-toolbar
-sqlparse==0.3.0
-
-# django-extensions
-typing==3.7.4.1
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -3,8 +3,8 @@
 # Include production requirements
 -r env.txt
 
-coverage==5.1
+coverage==5.2.1
 
-django-debug-toolbar==1.11
+django-debug-toolbar==2.2
 
-django-extensions==2.2.5
+django-extensions==3.0.4
diff --git a/requirements/env.txt b/requirements/env.txt
@@ -1,26 +1,25 @@
 # Full set of requirements to be installed in the virtualenv
 
-Django==2.2.13
-Pillow==6.2.2
+Django==2.2.15
+Pillow==7.2.0
 bleach==3.1.5
-commonware==0.5.0
+commonware==0.6.0
 compare-locales==8.0.0
 django-compressor==2.4
-django_csp==3.5
+django_csp==3.6
 django-session-csrf==0.7.1
 elasticsearch==2.4.1
 feedparser==5.2.1
-html5lib==1.0.1
-kombu==4.6.10
-markus[datadog]==1.2.0
+html5lib==1.1
+kombu==4.6.11
+markus[datadog]==2.2.0
 mercurial==5.4.1
-mock==3.0.5
 mozilla-django-oidc==1.2.3
-# <=1.3.13 Django
-mysqlclient==1.3.13
+# >=1.3.13 Django
+mysqlclient==2.0.1
 python-hglib==2.6.1
 python-memcached==1.59
-raven==6.10.0
-whitenoise==4.1.4
+sentry-sdk==0.16.3
+whitenoise==5.2.0
 
 -c constraints.txt