Merge #2281

2281: Dependencies 2020-10-28 r=mythmon a=mythmon

- Switch from drf-yasg to drf-yasg2 for better compatibility
- Update dependency djangorestframework to 3.12.*
- Update dependency factory_boy to v3


Co-authored-by: Mike Cooper <mythmon@gmail.com>
Co-authored-by: Renovate Bot <bot@renovateapp.com>

normandy/base/api/routers.py

@@ -21,10 +21,10 @@ def get_urls(self):
 
         return urls
 
-    def register(self, prefix, viewset, base_name=None, allow_cdn=True):
+    def register(self, prefix, viewset, basename=None, allow_cdn=True):
         if not allow_cdn:
             raise NotImplementedError("Can't pass allow_cdn=False for viewsets")
-        super().register(prefix, viewset, base_name=base_name)
+        super().register(prefix, viewset, basename=basename)
 
     def register_view(self, prefix, View, *, name, allow_cdn=True, **kwargs):
         url_pattern = url(r"^{}/$".format(prefix), View.as_view(), name=name, **kwargs)

normandy/base/api/swagger_urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import url
 
-from drf_yasg.views import get_schema_view
-from drf_yasg import openapi
+from drf_yasg2.views import get_schema_view
+from drf_yasg2 import openapi
 from rest_framework import permissions
 
 

normandy/base/api/utils.py

@@ -1,8 +1,7 @@
 import re
 
 from django.contrib.admindocs.views import simplify_regex
-
-from rest_framework.compat import URLPattern, URLResolver, get_original_route
+from django.urls import URLPattern, URLResolver
 
 
 _PATH_PARAMETER_COMPONENT_RE = re.compile(r"<(?:(?P<converter>[^>:]+):)?(?P<parameter>\w+)>")
@@ -72,7 +71,7 @@ def get_api_endpoints(patterns=None, namespace="", prefix=""):
     api_endpoints = []
 
     for pattern in patterns:
-        path_regex = prefix + get_original_route(pattern)
+        path_regex = prefix + str(pattern.pattern)
 
         if isinstance(pattern, URLPattern):
             path = get_path_from_regex(path_regex)

normandy/base/tests/__init__.py

@@ -4,7 +4,8 @@
 
 from django.contrib.auth.models import Group, User
 
-from factory import DjangoModelFactory, fuzzy, Sequence
+from factory import fuzzy, Sequence
+from factory.django import DjangoModelFactory
 import pytest
 
 

normandy/recipes/tests/__init__.py

@@ -6,6 +6,7 @@
 from django.utils import timezone
 
 import factory
+from factory.django import DjangoModelFactory
 
 from normandy.base.tests import FuzzyUnicode, UserFactory, FuzzySlug
 from normandy.base.utils import sri_hash
@@ -24,7 +25,7 @@
 )
 
 
-class ChannelFactory(factory.DjangoModelFactory):
+class ChannelFactory(DjangoModelFactory):
     class Meta:
         model = Channel
         django_get_or_create = ("slug",)
@@ -33,7 +34,7 @@ class Meta:
     name = "Beta"
 
 
-class WindowsVersionFactory(factory.DjangoModelFactory):
+class WindowsVersionFactory(DjangoModelFactory):
     class Meta:
         model = WindowsVersion
         django_get_or_create = ("nt_version",)
@@ -42,7 +43,7 @@ class Meta:
     name = "Windows 7"
 
 
-class CountryFactory(factory.DjangoModelFactory):
+class CountryFactory(DjangoModelFactory):
     class Meta:
         model = Country
         django_get_or_create = ("code",)
@@ -51,7 +52,7 @@ class Meta:
     name = "Sweden"
 
 
-class LocaleFactory(factory.DjangoModelFactory):
+class LocaleFactory(DjangoModelFactory):
     class Meta:
         model = Locale
         django_get_or_create = ("code",)
@@ -82,7 +83,7 @@ def get_action_schemas():
     return _action_schemas
 
 
-class ActionFactory(factory.DjangoModelFactory):
+class ActionFactory(DjangoModelFactory):
     class Meta:
         model = Action
 
@@ -122,7 +123,7 @@ def arguments_schema(self, create, extracted=None, **kwargs):
             self.arguments_schema = {}
 
 
-class RecipeFactory(factory.DjangoModelFactory):
+class RecipeFactory(DjangoModelFactory):
     class Meta:
         model = Recipe
 
@@ -317,7 +318,7 @@ class BranchedAddonStudyArgumentsFactory(DictFactory):
 
 
 @factory.use_strategy(factory.BUILD_STRATEGY)
-class RecipeRevisionFactory(factory.DjangoModelFactory):
+class RecipeRevisionFactory(DjangoModelFactory):
     class Meta:
         model = RecipeRevision
 
@@ -407,22 +408,22 @@ class BucketSampleFilterFactory(DictFactory):
     count = factory.LazyAttribute(lambda o: factory.fuzzy.FuzzyInteger(0, o.total).fuzz())
 
 
-class ApprovalRequestFactory(factory.DjangoModelFactory):
+class ApprovalRequestFactory(DjangoModelFactory):
     class Meta:
         model = ApprovalRequest
 
     revision = factory.SubFactory(RecipeRevisionFactory)
 
 
-class EnabledStateFactory(factory.DjangoModelFactory):
+class EnabledStateFactory(DjangoModelFactory):
     class Meta:
         model = EnabledState
 
     creator = factory.SubFactory(UserFactory)
     revision = factory.SubFactory(RecipeRevisionFactory)
 
 
-class SignatureFactory(factory.DjangoModelFactory):
+class SignatureFactory(DjangoModelFactory):
     class Meta:
         model = Signature
         exclude = ["data"]

normandy/settings.py

@@ -21,7 +21,7 @@ class Core(Configuration):
         "product_details",
         "rest_framework",
         "graphene_django",
-        "drf_yasg",
+        "drf_yasg2",
         "storages",
         "raven.contrib.django.raven_compat",
         "corsheaders",

normandy/studies/tests/__init__.py

@@ -2,6 +2,7 @@
 import json
 import tempfile
 import zipfile
+from factory.django import DjangoModelFactory
 
 from normandy.base.tests import FuzzyUnicode
 from normandy.studies.models import Extension
@@ -124,7 +125,7 @@ def generate_install_rdf(self, data):
         self.add_file("install.rdf", INSTALL_RDF_TEMPLATE.format(insert).encode())
 
 
-class ExtensionFactory(factory.DjangoModelFactory):
+class ExtensionFactory(DjangoModelFactory):
     name = FuzzyUnicode()
     xpi = factory.django.FileField(from_func=lambda: WebExtensionFileFactory().open())
 

pyproject.toml

@@ -31,12 +31,12 @@ django-npm = "^1.0.0"
 django-storages = "^1.7.2"
 django_csp = "^3.5"
  # DRF does not follow semver, 3.11 is a breaking change
-djangorestframework = "3.10.*"
+djangorestframework = "3.12.*"
 djangorestframework-yaml = "^2.0.0"
 dockerflow = "^2020.0.0"
-drf-yasg = "^1.17.0"
+drf-yasg2 = "^1.19.2"
 ecdsa = "^0.16.0"
-factory_boy = "^2.12.0"
+factory_boy = "^3.0.0"
 fastecdsa = "^1.7.4"
 # Flake8 does not follow semver, and introduces backwards incompatible changes in minor updates
 flake8 = "3.8.*"