BOM-1084

Bump django-filter.
Rename the name to field-name.

common/djangoapps/entitlements/api/v1/filters.py

@@ -18,10 +18,10 @@ class CharListFilter(filters.CharFilter):
 class UUIDListFilter(CharListFilter):
     """ Filters a field via a comma-delimited list of UUIDs. """
 
-    def __init__(self, name='uuid', label=None, widget=None, method=None, lookup_expr='in', required=False,
+    def __init__(self, field_name='uuid', label=None, widget=None, method=None, lookup_expr='in', required=False,
                  distinct=False, exclude=False, **kwargs):
         super(UUIDListFilter, self).__init__(
-            name=name,
+            field_name=field_name,
             label=label,
             widget=widget,
             method=method,
@@ -36,7 +36,7 @@ class UUIDListFilter(CharListFilter):
 class CourseEntitlementFilter(filters.FilterSet):
 
     uuid = UUIDListFilter()
-    user = filters.CharFilter(name='user__username')
+    user = filters.CharFilter(field_name='user__username')
 
     class Meta:
         model = CourseEntitlement

requirements/edx/base.in

@@ -43,7 +43,7 @@ django-cors-headers                 # Used to allow to configure CORS headers fo
 django-countries                    # Country data for Django forms and model fields
 django-crum                         # Middleware that stores the current request and user in thread local storage
 django-fernet-fields                # via edx-enterprise (should be added to its setup.py)
-django-filter==1.0.4                # Allows users to filter Django querysets dynamically
+django-filter                       # Allows users to filter Django querysets dynamically
 django-ipware                       # Get the client's real IP address
 django-method-override
 django-model-utils

requirements/edx/base.txt

@@ -61,7 +61,7 @@ django-cors-headers==2.5.3
 django-countries==5.5
 django-crum==0.7.5
 django-fernet-fields==0.6
-django-filter==1.0.4
+django-filter==2.2.0
 django-ipware==2.1.0
 django-js-asset==1.2.2    # via django-mptt
 django-method-override==0.2.0
@@ -81,7 +81,7 @@ django-sekizai==1.0.0
 django-ses==0.8.13
 django-simple-history==2.8.0
 django-splash==0.2.5
-django-statici18n==1.8.3
+django-statici18n==1.9.0
 django-storages==1.8
 django-user-tasks==0.3.0
 django-waffle==0.18.0
@@ -92,7 +92,7 @@ git+https://github.com/edx/django-rest-framework-oauth.git@0a43e8525f1e3048efe4b
 djangorestframework-xml==1.4.0  # via edx-enterprise
 djangorestframework==3.9.4
 docopt==0.6.2
-docutils==0.15.2          # via botocore
+docutils==0.16            # via botocore
 drf-yasg==1.16
 edx-ace==0.1.13
 edx-analytics-data-api-client==0.15.3
@@ -105,7 +105,7 @@ edx-django-release-util==0.3.2
 edx-django-sites-extensions==2.4.2
 edx-django-utils==2.0.2
 edx-drf-extensions==2.4.5
-edx-enterprise==2.0.45
+edx-enterprise==2.0.46
 edx-i18n-tools==0.5.0
 edx-milestones==0.2.6
 edx-oauth2-provider==1.3.1

requirements/edx/coverage.txt

@@ -4,14 +4,14 @@
 #
 #    make upgrade
 #
-coverage==5.0.2
-diff-cover==2.5.0
-importlib-metadata==1.3.0  # via pluggy
+coverage==5.0.3
+diff-cover==2.5.2
+importlib-metadata==1.4.0  # via pluggy
 inflect==3.0.2            # via jinja2-pluralize
 jinja2-pluralize==0.3.0   # via diff-cover
 jinja2==2.10.3            # via diff-cover, jinja2-pluralize
 markupsafe==1.1.1         # via jinja2
-more-itertools==8.0.2     # via zipp
+more-itertools==8.1.0     # via zipp
 numpy==1.18.1             # via pandas
 pandas==0.22.0
 pluggy==0.13.1            # via diff-cover

requirements/edx/development.txt

@@ -53,7 +53,7 @@ contextlib2==0.6.0.post1
 cookies==2.2.1
 coreapi==2.3.3
 coreschema==0.0.4
-coverage==5.0.2
+coverage==5.0.3
 git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0
 git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2
 cryptography==2.8
@@ -62,7 +62,7 @@ cssutils==1.0.2
 ddt==1.2.2
 decorator==4.4.1
 defusedxml==0.5.0
-diff-cover==2.5.0
+diff-cover==2.5.2
 django-appconf==1.0.3
 django-babel-underscore==0.5.2
 django-babel==0.6.2
@@ -74,7 +74,7 @@ django-countries==5.5
 django-crum==0.7.5
 django-debug-toolbar==1.11
 django-fernet-fields==0.6
-django-filter==1.0.4
+django-filter==2.2.0
 django-ipware==2.1.0
 django-js-asset==1.2.2
 django-method-override==0.2.0
@@ -94,7 +94,7 @@ django-sekizai==1.0.0
 django-ses==0.8.13
 django-simple-history==2.8.0
 django-splash==0.2.5
-django-statici18n==1.8.3
+django-statici18n==1.9.0
 django-storages==1.8
 django-user-tasks==0.3.0
 django-waffle==0.18.0
@@ -106,7 +106,7 @@ djangorestframework-xml==1.4.0
 djangorestframework==3.9.4
 docker==4.1.0
 docopt==0.6.2
-docutils==0.15.2
+docutils==0.16
 drf-yasg==1.16
 edx-ace==0.1.13
 edx-analytics-data-api-client==0.15.3
@@ -119,7 +119,7 @@ edx-django-release-util==0.3.2
 edx-django-sites-extensions==2.4.2
 edx-django-utils==2.0.2
 edx-drf-extensions==2.4.5
-edx-enterprise==2.0.45
+edx-enterprise==2.0.46
 edx-i18n-tools==0.5.0
 edx-lint==1.3.0
 edx-milestones==0.2.6
@@ -161,7 +161,7 @@ httplib2==0.15.0
 httpretty==0.9.7
 idna==2.8
 imagesize==1.2.0          # via sphinx
-importlib-metadata==1.3.0
+importlib-metadata==1.4.0
 inflect==3.0.2
 inflection==0.3.1
 ipaddress==1.0.23
@@ -197,7 +197,7 @@ mistune==0.8.4            # via m2r
 mock==3.0.5
 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2
 mongoengine==0.10.0
-more-itertools==8.0.2
+more-itertools==8.1.0
 moto==1.3.1
 mpmath==1.1.0
 mysqlclient==1.4.6
@@ -253,7 +253,7 @@ pytest-django==3.7.0
 pytest-forked==1.1.3
 pytest-json-report==1.2.1
 pytest-metadata==1.8.0
-pytest-randomly==3.2.0
+pytest-randomly==3.2.1
 pytest-xdist==1.31.0
 pytest==5.3.2
 python-dateutil==2.4.0

requirements/edx/testing.txt

@@ -52,7 +52,7 @@ contextlib2==0.6.0.post1
 cookies==2.2.1            # via moto
 coreapi==2.3.3
 coreschema==0.0.4
-coverage==5.0.2
+coverage==5.0.3
 git+https://github.com/nedbat/coverage_pytest_plugin.git@29de030251471e200ff255eb9e549218cd60e872#egg=coverage_pytest_plugin==0.0
 git+https://github.com/edx/crowdsourcehinter.git@a7ffc85b134b7d8909bf1fefd23dbdb8eb28e467#egg=crowdsourcehinter-xblock==0.2
 cryptography==2.8
@@ -61,7 +61,7 @@ cssutils==1.0.2
 ddt==1.2.2
 decorator==4.4.1
 defusedxml==0.5.0
-diff-cover==2.5.0
+diff-cover==2.5.2
 django-appconf==1.0.3
 django-babel-underscore==0.5.2
 django-babel==0.6.2
@@ -72,7 +72,7 @@ django-cors-headers==2.5.3
 django-countries==5.5
 django-crum==0.7.5
 django-fernet-fields==0.6
-django-filter==1.0.4
+django-filter==2.2.0
 django-ipware==2.1.0
 django-js-asset==1.2.2
 django-method-override==0.2.0
@@ -92,7 +92,7 @@ django-sekizai==1.0.0
 django-ses==0.8.13
 django-simple-history==2.8.0
 django-splash==0.2.5
-django-statici18n==1.8.3
+django-statici18n==1.9.0
 django-storages==1.8
 django-user-tasks==0.3.0
 django-waffle==0.18.0
@@ -103,7 +103,7 @@ djangorestframework-xml==1.4.0
 djangorestframework==3.9.4
 docker==4.1.0             # via moto
 docopt==0.6.2
-docutils==0.15.2
+docutils==0.16
 drf-yasg==1.16
 edx-ace==0.1.13
 edx-analytics-data-api-client==0.15.3
@@ -116,7 +116,7 @@ edx-django-release-util==0.3.2
 edx-django-sites-extensions==2.4.2
 edx-django-utils==2.0.2
 edx-drf-extensions==2.4.5
-edx-enterprise==2.0.45
+edx-enterprise==2.0.46
 edx-i18n-tools==0.5.0
 edx-lint==1.3.0
 edx-milestones==0.2.6
@@ -156,7 +156,7 @@ html5lib==1.0.1
 httplib2==0.15.0
 httpretty==0.9.7
 idna==2.8
-importlib-metadata==1.3.0
+importlib-metadata==1.4.0
 inflect==3.0.2
 inflection==0.3.1
 ipaddress==1.0.23
@@ -189,7 +189,7 @@ mccabe==0.6.1             # via flake8, pylint
 mock==3.0.5
 git+https://github.com/edx/MongoDBProxy.git@d92bafe9888d2940f647a7b2b2383b29c752f35a#egg=MongoDBProxy==0.1.0+edx.2
 mongoengine==0.10.0
-more-itertools==8.0.2
+more-itertools==8.1.0
 moto==1.3.1
 mpmath==1.1.0
 mysqlclient==1.4.6
@@ -242,7 +242,7 @@ pytest-django==3.7.0
 pytest-forked==1.1.3      # via pytest-xdist
 pytest-json-report==1.2.1
 pytest-metadata==1.8.0    # via pytest-json-report
-pytest-randomly==3.2.0
+pytest-randomly==3.2.1
 pytest-xdist==1.31.0
 pytest==5.3.2
 python-dateutil==2.4.0