[requires.io] dependency update on develop branch

docs/requirements.txt

@@ -4,28 +4,28 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in
 #
-alabaster==0.7.10         # via sphinx
+alabaster==0.7.12         # via sphinx
 argh==0.26.2              # via sphinx-autobuild, watchdog
-babel==2.4.0              # via sphinx
+babel==2.9.1              # via sphinx
 backports-abc==0.5        # via tornado
-certifi==2017.4.17        # via tornado
-commonmark==0.5.4         # via recommonmark
-docutils==0.13.1          # via recommonmark, sphinx
-imagesize==0.7.1          # via sphinx
-Jinja2==2.9.6             # via sphinx
-livereload==2.5.1         # via sphinx-autobuild
-MarkupSafe==1.0           # via jinja2
+certifi==2021.5.30        # via tornado
+commonmark==0.9.1         # via recommonmark
+docutils==0.17.1          # via recommonmark, sphinx
+imagesize==1.2.0          # via sphinx
+Jinja2==3.0.1             # via sphinx
+livereload==2.6.3         # via sphinx-autobuild
+MarkupSafe==2.0.1           # via jinja2
 pathtools==0.1.2          # via sphinx-autobuild, watchdog
-port-for==0.3.1           # via sphinx-autobuild
-Pygments==2.2.0           # via sphinx
-pytz==2017.2              # via babel
-PyYAML==3.12              # via sphinx-autobuild, watchdog
-recommonmark==0.4.0
-requests==2.13.0          # via sphinx
-singledispatch==3.4.0.3   # via tornado
-six==1.10.0               # via livereload, singledispatch, sphinx
-snowballstemmer==1.2.1    # via sphinx
-sphinx-autobuild==0.6.0
-sphinx==1.5.5
-tornado==4.5.1            # via livereload, sphinx-autobuild
-watchdog==0.8.3           # via sphinx-autobuild
+port-for==0.6.1           # via sphinx-autobuild
+Pygments==2.10.0           # via sphinx
+pytz==2021.1              # via babel
+PyYAML==5.4.1              # via sphinx-autobuild, watchdog
+recommonmark==0.7.1
+requests==2.26.0          # via sphinx
+singledispatch==3.7.0   # via tornado
+six==1.16.0               # via livereload, singledispatch, sphinx
+snowballstemmer==2.1.0    # via sphinx
+sphinx-autobuild==2021.3.14
+sphinx==4.1.2
+tornado==6.1            # via livereload, sphinx-autobuild
+watchdog==2.1.3           # via sphinx-autobuild

requirements.txt

@@ -1,3 +1,6 @@
+djangorestframework<3.7  # Avoid JSONField errors with Django 1.8
+django-filter<1.1  # Avoid get_filter_name() errors with Django 1.8
+
 -e .[api,brightcove,dev,docs,django18,forms,project,search,test,events,collections]
 
 -e git+https://github.com/ixc/django-dynamic-fixture.git@caeb3427399edd3b0d589516993c7da55e0de560#egg=django-dynamic-fixture

setup.py

@@ -61,13 +61,20 @@ def find_packages(*paths):
         'django-polymorphic>=0.8,!=1,!=1.0.1',
         'django-wysiwyg',
         'django_extensions',
-        'html5lib==0.999',  # See: https://github.com/html5lib/html5lib-python/issues/189 and https://github.com/pydanny-archive/django-wysiwyg/issues/61
+        'html5lib==1.1',  # See: https://github.com/html5lib/html5lib-python/issues/189 and https://github.com/pydanny-archive/django-wysiwyg/issues/61
         'nltk',
         'Pillow>=4',  # See: https://github.com/python-pillow/Pillow/issues/2206
         'pip-tools',
         'requests',
         'unidecode',
         'bleach<2',  # Bleach 2 adds a dependency on html5lib>=0.99999999, which breaks our above requirement of html5lib==0.999
+
+        # Django 1.8-specific version dependencies that must be here to be
+        # respected. Ideally these restrictions would go below in the
+        # 'django18' section but setuptools does not respect them there.
+        # TODO Remove these once GLAMkit uses Django > 1.8 by default.
+        'djangorestframework<3.7',  # Avoid JSONField errors with Django 1.8
+        'django-filter<1.1',  # Avoid get_filter_name() errors with Django 1.8
     ],
     extras_require={
         'api': [
@@ -88,7 +95,7 @@ def find_packages(*paths):
             'Werkzeug',
         ],
         'django18': [
-            'Django>=1.8,<1.9',  # LTS
+            'Django>=3.2,<3.3',  # LTS
         ],
         'forms': [
             'django-forms-builder',
@@ -110,7 +117,7 @@ def find_packages(*paths):
             'django-polymorphic-auth',
             'django-post-office',
             'django-redis',
-            'django-reversion>=1.9.3,<1.10',  # 1.9.3+ use DB transactions 1.10 has breaking changes for Django 1.9'
+            'django-reversion>=4.0,<4.1',  # 1.9.3+ use DB transactions 1.10 has breaking changes for Django 1.9'
             'django-storages<1.6', # 1.7 breaks s3 URLs - see https://github.com/jschneier/django-storages/issues/343
             'django-test-without-migrations',
             'django-timezone',
@@ -131,11 +138,11 @@ def find_packages(*paths):
         'search': [
             'django-fluent-pages[flatpage,fluentpage]',
             'django-haystack',
-            'elasticsearch>=1.0.0,<2.0.0',
+            'elasticsearch>=7.14,<7.15',
             'elasticstack',
         ],
         'test': [
-            'celery[redis]==3.1.24',
+            'celery[redis]==5.1.2',
             'coverage',
             'coveralls',
             'django-dynamic-fixture',
@@ -165,8 +172,8 @@ def find_packages(*paths):
             'pyparsing',
             'unidecode',
             'edtf>=2.5',
-            'webcolors==1.5',
-            'colormath==2.1.1',
+            'webcolors==1.11.1',
+            'colormath==3.0.0',
             # Disable as it's devpi-only
             # 'colorweave==0.1+0.ce27c83b4e06a8185531538fa11c18c5ea2c1aba.ixc',
         ]

tox.ini

@@ -28,7 +28,7 @@ deps =
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     postgres: psycopg2
-    py32: coverage==3.7.1
+    py32: coverage==5.5
 
 passenv = BASE_SETTINGS_MODULE PG* TERM TRAVIS LANG SSH_AUTH_SOCK