Skip to content

Commit

Permalink
Merge pull request #143 from osminogin/support-django-1.10
Browse files Browse the repository at this point in the history
Django 1.10 support
  • Loading branch information
yangyubo committed Sep 4, 2016
2 parents 58786cf + 36eeabe commit 1f0c45d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ env:
- DJANGO=1.7
- DJANGO=1.8
- DJANGO=1.9
- DJANGO=1.10
install:
# command to install dependencies
- "pip install coveralls"
Expand All @@ -23,5 +24,7 @@ matrix:
env: DJANGO=1.7
- python: "3.3"
env: DJANGO=1.9
- python: "3.3"
env: DJANGO=1.10
after_success:
- coveralls
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Requirements
============

- Python 2.7, 3.3, 3.4, 3.5
- Django 1.7, 1.8, 1.9
- Django 1.7, 1.8, 1.9, 1.10

Installation
============
Expand Down
5 changes: 5 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
'Intended Audience :: Developers',
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Framework :: Django',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.7',
# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
'Programming Language :: Python',
Expand Down

0 comments on commit 1f0c45d

Please sign in to comment.