Skip to content

Commit a56432c

Browse files
authored
Merge pull request marcgibbons#610 from edmorley/support-django1.11
Test against Django 1.11
2 parents d1bd5a9 + 1961c7a commit a56432c

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## Unreleased
4+
5+
- Confirmed support for Django 1.11.
6+
37
## [2.1.1](https://github.com/marcgibbons/django-rest-swagger/tree/2.1.1) (2017-01-06)
48
[Full Changelog](https://github.com/marcgibbons/django-rest-swagger/compare/2.1.0...2.1.1)
59

setup.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
packages=['rest_framework_swagger'],
5252
include_package_data=True,
5353
license='FreeBSD License',
54-
description='Swagger UI for Django REST Framework 3.4+',
54+
description='Swagger UI for Django REST Framework 3.5+',
5555
long_description=README,
5656
test_suite='tests',
5757
author='Marc Gibbons',
@@ -60,10 +60,16 @@
6060
classifiers=[
6161
'Environment :: Web Environment',
6262
'Framework :: Django',
63+
'Framework :: Django :: 1.8',
64+
'Framework :: Django :: 1.9',
65+
'Framework :: Django :: 1.10',
66+
'Framework :: Django :: 1.11',
6367
'Intended Audience :: Developers',
6468
'License :: OSI Approved :: BSD License',
6569
'Operating System :: OS Independent',
6670
'Programming Language :: Python',
71+
'Programming Language :: Python :: 2',
72+
'Programming Language :: Python :: 3',
6773
'Programming Language :: Python :: 2.7',
6874
'Programming Language :: Python :: 3.5',
6975
'Topic :: Internet :: WWW/HTTP',

tox.ini

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
skipsdist=True
33
envlist =
44
latest
5-
{py27,py35}-django{18,19,110}-drf35
5+
{py27,py35}-django{18,19,110,111}-drf35
66
lint
77

88
[testenv]
@@ -17,6 +17,7 @@ deps =
1717
django18: Django>=1.8,<1.9
1818
django19: Django>=1.9,<1.10
1919
django110: Django>=1.10,<1.11
20+
django111: Django>=1.11a1,<2.0
2021

2122
[testenv:latest]
2223
commands = coverage run runtests.py

0 commit comments

Comments
 (0)