Skip to content

Commit

Permalink
Merge pull request carltongibson#336 from nikolas/django1.9
Browse files Browse the repository at this point in the history
test on final version of django 1.9
  • Loading branch information
Carlton Gibson committed Dec 9, 2015
2 parents 7df668c + 229c1ed commit ea4c84f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ python:

env:
- DJANGO='https://github.com/django/django/archive/master.tar.gz'
- DJANGO='https://www.djangoproject.com/download/1.9rc1/tarball/'
- DJANGO='django>=1.9.0,<1.10.0'
- DJANGO='django>=1.8.0,<1.9.0'

install:
Expand All @@ -30,11 +30,11 @@ matrix:
- python: "3.2"
env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
- python: "3.2"
env: DJANGO='https://www.djangoproject.com/download/1.9rc1/tarball/'
env: DJANGO='django>=1.9.0,<1.10.0'
- python: "3.3"
env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
- python: "3.3"
env: DJANGO='https://www.djangoproject.com/download/1.9rc1/tarball/'
env: DJANGO='django>=1.9.0,<1.10.0'
allow_failures:
- env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
fast_finish: true
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
'License :: OSI Approved :: BSD License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Framework :: Django',
],
include_package_data=True,
Expand Down

0 comments on commit ea4c84f

Please sign in to comment.