mirror of
https://github.com/encode/django-rest-framework.git
synced 2024-11-22 17:47:04 +03:00
Version 3.10.1 (#6817)
* Ensure that requiring 'uritemplate' does not also require 'coreapi' * Don't include autocomplete fields on TokenAuth admin * Version 3.10.1
This commit is contained in:
parent
9114034856
commit
044252af1c
|
@ -8,7 +8,7 @@ ______ _____ _____ _____ __
|
|||
"""
|
||||
|
||||
__title__ = 'Django REST framework'
|
||||
__version__ = '3.10.0'
|
||||
__version__ = '3.10.1'
|
||||
__author__ = 'Tom Christie'
|
||||
__license__ = 'BSD 2-Clause'
|
||||
__copyright__ = 'Copyright 2011-2019 Encode OSS Ltd'
|
||||
|
|
|
@ -7,7 +7,6 @@ class TokenAdmin(admin.ModelAdmin):
|
|||
list_display = ('key', 'user', 'created')
|
||||
fields = ('user',)
|
||||
ordering = ('-created',)
|
||||
autocomplete_fields = ('user',)
|
||||
|
||||
|
||||
admin.site.register(Token, TokenAdmin)
|
||||
|
|
|
@ -93,12 +93,16 @@ except ImportError:
|
|||
postgres_fields = None
|
||||
|
||||
|
||||
# coreapi is optional (Note that uritemplate is a dependency of coreapi)
|
||||
# coreapi is required for CoreAPI schema generation
|
||||
try:
|
||||
import coreapi
|
||||
import uritemplate
|
||||
except ImportError:
|
||||
coreapi = None
|
||||
|
||||
# uritemplate is required for OpenAPI and CoreAPI schema generation
|
||||
try:
|
||||
import uritemplate
|
||||
except ImportError:
|
||||
uritemplate = None
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user