Merge pull request #794 from open-craft/giovanni/upgrade-packages

BB-4198: Batch dependabot upgrades + package upgrades

api/router.py

@@ -40,22 +40,22 @@
 
 v1_router = routers.DefaultRouter()
 
-v1_router.register(r'instance', InstanceViewSet, base_name='instance')
+v1_router.register(r'instance', InstanceViewSet, basename='instance')
 v1_router.register(r'openedx_appserver', OpenEdXAppServerViewSet)
 v1_router.register(r'openstackserver', OpenStackServerViewSet)
-v1_router.register(r'pr_watch', WatchedPullRequestViewSet, base_name='pr_watch')
+v1_router.register(r'pr_watch', WatchedPullRequestViewSet, basename='pr_watch')
 
 v2_router = routers.DefaultRouter()
-v2_router.register(r'accounts', AccountViewSet, base_name='accounts')
-v2_router.register(r'instances/openedx_config', OpenEdXInstanceConfigViewSet, base_name='openedx-instance-config')
+v2_router.register(r'accounts', AccountViewSet, basename='accounts')
+v2_router.register(r'instances/openedx_config', OpenEdXInstanceConfigViewSet, basename='openedx-instance-config')
 v2_router.register(
     r'instances/openedx_deployment',
     OpenEdxInstanceDeploymentViewSet,
-    base_name='openedx-instance-deployment'
+    basename='openedx-instance-deployment'
 )
 v2_router.register(
     r'notifications',
     NotificationsViewSet,
-    base_name='notifications'
+    basename='notifications'
 )
-v2_router.register(r'verify_email', VerifyEmailViewset, base_name='verify-email-api')
+v2_router.register(r'verify_email', VerifyEmailViewset, basename='verify-email-api')

cleanup_utils/requirements.txt

@@ -1,9 +1,9 @@
 boto3==1.9.171
 dns-lexicon==3.3.13
-Django==2.2.13
+Django==2.2.20
 django-environ==0.4.5
 mysqlclient==1.4.2.post1
 python-consul==1.1.0
 python-novaclient==14.1.0
-PyYAML==5.1.2
+PyYAML==5.4
 virtualenv==16.6.1

documentation/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile
+#    pip-compile documentation/requirements.in
 #
 click==7.0
     # via
@@ -12,7 +12,7 @@ future==0.18.2
     # via lunr
 importlib-metadata==3.3.0
     # via markdown
-jinja2==2.10.1
+jinja2==2.11.3
     # via mkdocs
 joblib==1.0.0
     # via nltk
@@ -25,11 +25,11 @@ markdown==3.3.3
 markupsafe==1.1.1
     # via jinja2
 mkdocs==1.1.2
-    # via -r requirements.in
+    # via -r documentation/requirements.in
 nltk==3.5
     # via lunr
 pygments==2.7.4
-    # via -r requirements.in
+    # via -r documentation/requirements.in
 pyyaml==5.1.2
     # via mkdocs
 regex==2020.11.13

frontend/package.json

@@ -90,7 +90,7 @@
     "react-redux": "^7.2.0",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "3.4.1",
+    "react-scripts": "^3.4.4",
     "react-test-renderer": "^16.13.1",
     "redux": "^4.0.5",
     "redux-actions": "^2.6.5",

instance/api/instance.py

@@ -23,7 +23,7 @@
 # Imports #####################################################################
 from django.db.models import Prefetch
 from rest_framework import viewsets, status
-from rest_framework.decorators import detail_route
+from rest_framework.decorators import action
 from rest_framework.response import Response
 
 from instance.models.instance import InstanceReference
@@ -105,21 +105,21 @@ def list(self, request, *args, **kwargs):
         serializer = InstanceReferenceBasicSerializer(queryset, many=True, context={'request': request})
         return Response(serializer.data)
 
-    @detail_route(methods=['get'])
+    @action(detail=True, methods=['get'])
     def logs(self, request, pk):
         """
         Get this Instance's log entries
         """
         return Response(InstanceLogSerializer(self.get_object()).data)
 
-    @detail_route(methods=['get'])
+    @action(detail=True, methods=['get'])
     def app_servers(self, request, pk):
         """
         Get this Instance's entire list of AppServers
         """
         return Response(InstanceAppServerSerializer(self.get_object(), context={'request': request}).data)
 
-    @detail_route(methods=['post'])
+    @action(detail=True, methods=['post'])
     def set_notes(self, request, pk):
         """
         Update notes attribute of selected instance.

instance/api/openedx_appserver.py

@@ -24,7 +24,7 @@
 
 from django.core.exceptions import ObjectDoesNotExist
 from rest_framework import serializers, status, viewsets
-from rest_framework.decorators import detail_route
+from rest_framework.decorators import action
 from rest_framework.exceptions import NotFound
 from rest_framework.response import Response
 
@@ -103,14 +103,14 @@ def create(self, request):
         )
         return Response({'status': 'Instance provisioning started'})
 
-    @detail_route(methods=['get'])
+    @action(detail=True, methods=['get'])
     def logs(self, request, pk):
         """
         Get this AppServer's log entries
         """
         return Response(OpenEdXAppServerLogSerializer(self.get_object()).data)
 
-    @detail_route(methods=['post'])
+    @action(detail=True, methods=['post'])
     def make_active(self, request, pk):
         """
         Add this AppServer to the list of active app server for the instance.
@@ -123,7 +123,7 @@ def make_active(self, request, pk):
 
         return Response({'status': 'App server activation initiated.'})
 
-    @detail_route(methods=['post'])
+    @action(detail=True, methods=['post'])
     def make_inactive(self, request, pk):
         """
         Remove this AppServer from the list of active app server for the instance.
@@ -132,7 +132,7 @@ def make_inactive(self, request, pk):
         make_appserver_active(app_server.pk, active=False)
         return Response({'status': 'App server deactivation initiated.'})
 
-    @detail_route(methods=['post'])
+    @action(detail=True, methods=['post'])
     def terminate(self, request, pk):
         """
         Terminate the VM running the provided AppServer.

package.json

@@ -19,7 +19,7 @@
   "dependencies": {},
   "devDependencies": {
     "jasmine": "^3.4.0",
-    "karma": "^5.0.2",
+    "karma": "^6",
     "karma-cli": "^2.0.0",
     "karma-coverage": "^2.0.2",
     "karma-firefox-launcher": "^1.3.0",

pr_watch/api.py

@@ -23,7 +23,7 @@
 # Imports #####################################################################
 
 from rest_framework import viewsets, serializers, status
-from rest_framework.decorators import detail_route
+from rest_framework.decorators import action
 from rest_framework.response import Response
 
 from pr_watch import github
@@ -43,7 +43,7 @@ class WatchedPullRequestViewSet(viewsets.ReadOnlyModelViewSet):
     serializer_class = WatchedPullRequestSerializer
     filter_backends = (IsOrganizationOwnerFilterBackendWatchedPR,)
 
-    @detail_route(methods=['post'])
+    @action(detail=True, methods=['post'])
     def update_instance(self, request, pk):
         """
         Update the instance associated with this PR, creating it if necessary.

requirements/base.in

@@ -27,10 +27,12 @@ django-simple-email-confirmation==0.60
 django-storage-swift==1.2.19
 django-storages==1.7.1
 django-zurb-foundation==5.5.0
-djangorestframework<3.10,>=3.9.4
+djangorestframework
 dnspython==2.1.0
 dns-lexicon==3.3.13
-djangorestframework-simplejwt==4.4.0
+djangorestframework-simplejwt
+# Pinned version since this causes issues with DRF-JWT package when using older python versions (3.8 and below)
+pyjwt==1.7.1
 docutils==0.14
 drf-yasg
 entrypoints==0.3
@@ -40,24 +42,26 @@ GitPython==2.1.15
 gunicorn==19.9.0
 honcho==1.0.1
 huey==2.1.0
+# Pinning Jedi otherwise IPython shell freezes when autocompleting.
+jedi==0.17.2
 jsonschema==3.2.0
-keystoneauth1==3.14.0
+keystoneauth1
 mailchimp3==3.0.13
 mccabe==0.6.1
 mysqlclient==1.4.2.post1
-openstacksdk==0.31.1
+openstacksdk
 os-client-config==1.32.0
 Pillow
 pip-tools==5.5.0
 psycopg2-binary==2.8.3
 pyjwkest==1.4.0
 pymongo==3.8.0
 python-consul==1.1.0
-python-glanceclient==2.16.0
-python-keystoneclient==3.19.0
-python-novaclient==14.1.0
-python-openstackclient==3.19.0
-python-swiftclient==3.7.0
+python-glanceclient
+python-keystoneclient
+python-novaclient
+python-openstackclient
+python-swiftclient
 pytz==2019.1
 PyYAML<5.5,>=5.4.1
 redis==3.2.1