Merge branch 'master' into fix-flaky-test

Author: stsewd

pytest.ini

@@ -13,6 +13,3 @@ filterwarnings =
     ignore:Pagination may yield inconsistent results with an unordered object_list.*:django.core.paginator.UnorderedObjectListWarning
     # docutils
     ignore:'U' mode is deprecated:DeprecationWarning
-
-    # rest_framework_extensions.routers raises these
-    ignore::rest_framework.RemovedInDRF311Warning

readthedocs/api/v3/serializers.py

@@ -99,7 +99,7 @@ class BuildConfigSerializer(FlexFieldsSerializerMixin, serializers.Serializer):
        which may produce incompatible changes in the API.
     """
 
-    def to_representation(self, instance):
+    def to_representation(self, instance):  # pylint: disable=arguments-differ
         # For now, we want to return the ``config`` object as it is without
         # manipulating it.
         return instance

requirements/deploy.txt

@@ -1,8 +1,8 @@
 -r pip.txt
 # http://initd.org/psycopg/docs/install.html#binary-install-from-pypi
 psycopg2==2.8.3 --no-binary psycopg2
-gunicorn==19.9.0
-django-redis-cache==2.1.0
+gunicorn==20.0.4
+django-redis-cache==2.1.1
 
 #For resizing images
-pillow==7.0.0
+pillow==7.1.2

requirements/docker.txt

@@ -1,16 +1,16 @@
 -r pip.txt
 # http://initd.org/psycopg/docs/install.html#binary-install-from-pypi
-psycopg2-binary==2.8.3
-django-redis-cache==2.1.0
+psycopg2-binary==2.8.5
+django-redis-cache==2.1.1
 
 # For resizing images
-pillow==7.0.0
+pillow==7.1.2
 
 # local debugging tools
-watchdog==0.9.0
+watchdog==0.10.2
 datadiff==2.0.0
-ipdb==0.12.2
+ipdb==0.13.2
 pdbpp==0.10.2
 
 # run tests
-tox==3.14.1
+tox==3.15.0

requirements/pip.txt

@@ -1,13 +1,13 @@
 # Base packages
-pip==20.0.2
+pip==20.1
 appdirs==1.4.3
-virtualenv==20.0.16
+virtualenv==20.0.20
 
 django==2.2.12  # pyup: <2.3
 django-extensions==2.2.9
 django_polymorphic==2.1.2
 
-djangorestframework==3.10.3
+djangorestframework==3.11.0
 
 # For intersphinx during builds
 # Use <2.x until we fix some issues in our theme.
@@ -17,11 +17,11 @@ Sphinx==1.8.5  # pyup: <2.0.0
 # Filtering for the REST API
 django-filter==2.2.0
 
-drf-flex-fields==0.6.1
-drf-extensions==0.5.0
+drf-flex-fields==0.8.0
+drf-extensions==0.6.0
 
 django-vanilla-views==1.0.6
-jsonfield==2.0.2
+jsonfield==3.1.0
 
 requests==2.23.0
 requests-toolbelt==0.9.1
@@ -42,10 +42,10 @@ celery==4.1.1  # pyup: ignore
 
 django-allauth==0.41.0
 
-GitPython==3.0.8
+GitPython==3.1.1
 
 # Search
-elasticsearch==6.4.0  # pyup: <7.0.0
+elasticsearch==6.8.1  # pyup: <7.0.0
 
 
 # elasticsearch-dsl==6.3.1 produces this error
@@ -70,37 +70,38 @@ orjson==2.0.7  # pyup: ignore
 
 # Utils
 django-gravatar2==1.4.4
-pytz==2019.3
+pytz==2020.1
 Unipath==1.1
 django-kombu==0.9.4
-stripe==2.44.0
+stripe==2.47.0
 regex==2020.4.4
 
 # unicode-slugify==0.1.5 is not released on PyPI yet
 git+https://github.com/mozilla/unicode-slugify@b696c37#egg=unicode-slugify==0.1.5
 
-django-formtools==2.1
-django-crispy-forms==1.8.0
+django-formtools==2.2
+django-crispy-forms==1.9.0
 
-docker==4.1.0
+docker==4.2.0
 
 django-textclassifier==1.0
 # django-textclassifier doesn't have pinned versions
 # if there is an update they could break our code
-nltk==3.4.5
+nltk==3.5
 textblob==0.15.3
 
-django-annoying==0.10.5
-django-messages-extends==0.6.2 
+django-annoying==0.10.6
+django-messages-extends==0.6.2
 djangorestframework-jsonp==1.0.2
-django-taggit==1.1.0
+django-taggit==1.2.0
 dj-pagination==2.4.0
 
 # Version comparison stuff
-packaging==19.2
+packaging==20.3
 
-# Commenting stuff
-django-cors-middleware==1.4.0
+# django-cors-middleware==1.5.0 fails with
+# AttributeError: 'dict' object has no attribute 'has_header'
+django-cors-middleware==1.4.0  # pyup: ignore
 
 # User agent parsing - used for analytics purposes
 user-agents==2.1

requirements/testing.txt

@@ -4,8 +4,8 @@
 django-dynamic-fixture==3.1.0
 pytest==5.4.2
 pytest-custom-exit-code==0.3.0
-pytest-django==3.8.0
-pytest-xdist==1.30.0
+pytest-django==3.9.0
+pytest-xdist==1.32.0
 pytest-cov==2.8.1
 apipkg==1.5
 execnet==1.7.1
@@ -19,7 +19,7 @@ execnet==1.7.1
 Mercurial==4.4.2  # pyup: ignore
 
 yamale==2.0.1
-pytest-mock==1.11.2
+pytest-mock==3.1.0
 
 # local debugging tools
 datadiff==2.0.0