Skip to content

Version 3.10.1 #6817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 17, 2019
Merged

Version 3.10.1 #6817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e68957a
Ensure that requiring 'uritemplate' does not also require 'coreapi'
tomchristie Jul 17, 2019
45646f4
Don't include autocomplete fields on TokenAuth admin
tomchristie Jul 17, 2019
9920835
Version 3.10.1
tomchristie Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rest_framework/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion rest_framework/authtoken/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 6 additions & 2 deletions rest_framework/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,16 @@ def distinct(queryset, base):
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


Expand Down