fix: solve issue with api_doc_tools and update requirements (#202)

Makefile

@@ -57,3 +57,6 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
 	$(PIP_COMPILE) -o requirements/test.txt requirements/test.in
 	$(PIP_COMPILE) -o requirements/tox.txt requirements/tox.in
 
+	grep -e "^django==" requirements/test.txt > requirements/django.txt
+	sed '/^[dD]jango==/d;' requirements/test.txt > requirements/test.tmp
+	mv requirements/test.tmp requirements/test.txt

requirements/base.in

@@ -8,6 +8,6 @@ django-filter
 django-oauth-toolkit
 django-oauth2-provider
 django-waffle
-edx-api-doc-tools==1.5.0
+edx-api-doc-tools<1.6
 edx-proctoring
 edx-opaque-keys[django]

requirements/base.txt

@@ -29,7 +29,7 @@ coreschema==0.0.4
     # via
     #   coreapi
     #   drf-yasg
-cryptography==36.0.1
+cryptography==36.0.2
     # via pyjwt
 django==3.2.12
     # via
@@ -78,7 +78,7 @@ django-waffle==2.2.1
     #   edx-django-utils
     #   edx-drf-extensions
     #   edx-proctoring
-django-webpack-loader==1.4.1
+django-webpack-loader==1.5.0
     # via edx-proctoring
 djangorestframework==3.13.1
     # via
@@ -93,7 +93,7 @@ drf-jwt==1.19.2
     # via edx-drf-extensions
 drf-yasg==1.20.0
     # via edx-api-doc-tools
-edx-api-doc-tools==1.5.0
+edx-api-doc-tools==1.5.1
     # via -r requirements/base.in
 edx-django-utils==4.4.0
     # via
@@ -136,7 +136,7 @@ inflection==0.5.1
     # via drf-yasg
 itypes==1.2.0
     # via coreapi
-jinja2==3.0.3
+jinja2==3.1.1
     # via coreschema
 jsonfield==3.1.0
     # via
@@ -146,7 +146,7 @@ kombu==4.6.11
     # via celery
 lxml==4.8.0
     # via xblock
-markupsafe==2.1.0
+markupsafe==2.1.1
     # via
     #   jinja2
     #   xblock
@@ -180,14 +180,14 @@ pymongo==3.12.3
     # via
     #   edx-opaque-keys
     #   event-tracking
-pyparsing==3.0.7
+pyparsing==3.0.8
     # via packaging
 python-dateutil==2.8.2
     # via
     #   edx-drf-extensions
     #   edx-proctoring
     #   xblock
-pytz==2021.3
+pytz==2022.1
     # via
     #   celery
     #   django
@@ -210,7 +210,7 @@ ruamel-yaml==0.17.21
     # via drf-yasg
 ruamel-yaml-clib==0.2.6
     # via ruamel-yaml
-rules==3.1
+rules==3.3
     # via edx-proctoring
 semantic-version==2.9.0
     # via edx-drf-extensions
@@ -236,7 +236,7 @@ uritemplate==4.1.1
     # via
     #   coreapi
     #   drf-yasg
-urllib3==1.26.8
+urllib3==1.26.9
     # via requests
 vine==1.3.0
     # via

requirements/django.txt

@@ -1 +1 @@
-django==3.2.12
+django==3.2.12

requirements/pip-tools.txt

@@ -4,11 +4,11 @@
 #
 #    make upgrade
 #
-click==8.0.4
+click==8.1.2
     # via pip-tools
 pep517==0.12.0
     # via pip-tools
-pip-tools==6.5.1
+pip-tools==6.6.0
     # via -r requirements/pip-tools.in
 tomli==2.0.1
     # via pep517

requirements/test.txt

@@ -52,10 +52,27 @@ coreschema==0.0.4
     #   drf-yasg
 coverage==6.3.2
     # via -r requirements/test.in
-cryptography==36.0.1
+cryptography==36.0.2
     # via
     #   -r requirements/base.txt
     #   pyjwt
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/base.txt
+    #   django-crum
+    #   django-filter
+    #   django-model-utils
+    #   django-oauth-toolkit
+    #   djangorestframework
+    #   drf-jwt
+    #   drf-yasg
+    #   edx-api-doc-tools
+    #   edx-django-utils
+    #   edx-drf-extensions
+    #   edx-proctoring
+    #   edx-when
+    #   event-tracking
+    #   jsonfield
 django-countries==7.2.1
     # via
     #   -c requirements/constraints.txt
@@ -96,7 +113,7 @@ django-waffle==2.2.1
     #   edx-django-utils
     #   edx-drf-extensions
     #   edx-proctoring
-django-webpack-loader==1.4.1
+django-webpack-loader==1.5.0
     # via
     #   -r requirements/base.txt
     #   edx-proctoring
@@ -117,7 +134,7 @@ drf-yasg==1.20.0
     # via
     #   -r requirements/base.txt
     #   edx-api-doc-tools
-edx-api-doc-tools==1.5.0
+edx-api-doc-tools==1.5.1
     # via -r requirements/base.txt
 edx-django-utils==4.4.0
     # via
@@ -161,7 +178,7 @@ factory-boy==3.2.0
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/test.in
-faker==13.2.0
+faker==13.3.4
     # via factory-boy
 fs==2.4.15
     # via
@@ -187,7 +204,7 @@ itypes==1.2.0
     # via
     #   -r requirements/base.txt
     #   coreapi
-jinja2==3.0.3
+jinja2==3.1.1
     # via
     #   -r requirements/base.txt
     #   coreschema
@@ -206,7 +223,7 @@ lxml==4.8.0
     # via
     #   -r requirements/base.txt
     #   xblock
-markupsafe==2.1.0
+markupsafe==2.1.1
     # via
     #   -r requirements/base.txt
     #   jinja2
@@ -276,11 +293,11 @@ pymongo==3.12.3
     #   -r requirements/base.txt
     #   edx-opaque-keys
     #   event-tracking
-pyparsing==3.0.7
+pyparsing==3.0.8
     # via
     #   -r requirements/base.txt
     #   packaging
-pytest==7.0.1
+pytest==7.1.1
     # via
     #   -r requirements/test.in
     #   pytest-django
@@ -293,7 +310,7 @@ python-dateutil==2.8.2
     #   edx-proctoring
     #   faker
     #   xblock
-pytz==2021.3
+pytz==2022.1
     # via
     #   -r requirements/base.txt
     #   celery
@@ -324,7 +341,7 @@ ruamel-yaml-clib==0.2.6
     # via
     #   -r requirements/base.txt
     #   ruamel-yaml
-rules==3.1
+rules==3.3
     # via
     #   -r requirements/base.txt
     #   edx-proctoring
@@ -357,7 +374,7 @@ stevedore==3.5.0
     #   -r requirements/base.txt
     #   edx-django-utils
     #   edx-opaque-keys
-testfixtures==6.18.4
+testfixtures==6.18.5
     # via -r requirements/test.in
 toml==0.10.2
     # via pylint
@@ -372,7 +389,7 @@ uritemplate==4.1.1
     #   -r requirements/base.txt
     #   coreapi
     #   drf-yasg
-urllib3==1.26.8
+urllib3==1.26.9
     # via
     #   -r requirements/base.txt
     #   requests

requirements/tox.txt

@@ -18,15 +18,15 @@ pluggy==1.0.0
     # via tox
 py==1.11.0
     # via tox
-pyparsing==3.0.7
+pyparsing==3.0.8
     # via packaging
 six==1.16.0
     # via
     #   tox
     #   virtualenv
 toml==0.10.2
     # via tox
-tox==3.24.5
+tox==3.25.0
     # via -r requirements/tox.in
-virtualenv==20.13.2
+virtualenv==20.14.1
     # via tox