浏览代码

feat(api): bump dependencies, including Django 3.0

Peter Thomassen 5 年之前
父节点
当前提交
85fae1c65c
共有 3 个文件被更改,包括 11 次插入11 次删除
  1. 2 2
      api/desecapi/serializers.py
  2. 1 1
      api/desecapi/urls/version_1.py
  3. 8 8
      api/requirements.txt

+ 2 - 2
api/desecapi/serializers.py

@@ -579,11 +579,11 @@ class CustomFieldNameUniqueValidator(UniqueValidator):
         self.lookup_field = lookup_field
         self.lookup_field = lookup_field
         super().__init__(queryset, message, lookup)
         super().__init__(queryset, message, lookup)
 
 
-    def filter_queryset(self, value, queryset):
+    def filter_queryset(self, value, queryset, field_name):
         """
         """
         Filter the queryset to all instances matching the given value on the specified lookup field.
         Filter the queryset to all instances matching the given value on the specified lookup field.
         """
         """
-        filter_kwargs = {'%s__%s' % (self.lookup_field or self.field_name, self.lookup): value}
+        filter_kwargs = {'%s__%s' % (self.lookup_field or field_name, self.lookup): value}
         return qs_filter(queryset, **filter_kwargs)
         return qs_filter(queryset, **filter_kwargs)
 
 
 
 

+ 1 - 1
api/desecapi/urls/version_1.py

@@ -4,7 +4,7 @@ from rest_framework.routers import SimpleRouter
 from desecapi import views
 from desecapi import views
 
 
 tokens_router = SimpleRouter()
 tokens_router = SimpleRouter()
-tokens_router.register(r'', views.TokenViewSet, base_name='token')
+tokens_router.register(r'', views.TokenViewSet, basename='token')
 
 
 auth_urls = [
 auth_urls = [
     # User management
     # User management

+ 8 - 8
api/requirements.txt

@@ -1,13 +1,13 @@
 captcha~=0.3.0
 captcha~=0.3.0
-celery~=4.3.0
-coverage~=4.5.3
+celery~=4.4.0
+coverage~=5.0
 cryptography~=2.8
 cryptography~=2.8
-Django~=2.2.0
-django-cors-headers~=3.1.1
-djangorestframework~=3.10.3
-django-celery-email~=2.0.2
+Django~=3.0.0
+django-cors-headers~=3.2.0
+djangorestframework~=3.11.0
+django-celery-email~=3.0.0
 httpretty~=0.9.0
 httpretty~=0.9.0
 mysqlclient~=1.4.0
 mysqlclient~=1.4.0
-psl-dns~=1.0rc2
-requests~=2.21.0
+psl-dns~=1.0
+requests~=2.22.0
 uwsgi~=2.0.0
 uwsgi~=2.0.0