Merge pull request #30 from dwaynebailey/django110-support

Add Django 1.10 support
This commit is contained in:
Stephen McDonald
2016-08-19 10:06:07 +10:00
committed by GitHub
2 changed files with 6 additions and 6 deletions

View File

@@ -1,8 +1,8 @@
language: python language: python
env: env:
- DJANGO_VERSION=1.7
- DJANGO_VERSION=1.8 - DJANGO_VERSION=1.8
- DJANGO_VERSION=1.9 - DJANGO_VERSION=1.9
- DJANGO_VERSION=1.10
python: python:
- "2.7" - "2.7"
- "3.3" - "3.3"
@@ -10,11 +10,11 @@ python:
- "3.5" - "3.5"
matrix: matrix:
exclude: exclude:
- python: "3.5"
env: "DJANGO_VERSION=1.7"
- python: "3.3" - python: "3.3"
env: "DJANGO_VERSION=1.9" env: "DJANGO_VERSION=1.9"
- python: "3.3"
env: "DJANGO_VERSION=1.10"
install: install:
- pip install django==$DJANGO_VERSION --use-mirrors - pip install django==$DJANGO_VERSION
- pip install . --use-mirrors - pip install .
script: ./test_project/manage.py test script: ./test_project/manage.py test

View File

@@ -16,7 +16,7 @@ setup(
packages = find_packages(), packages = find_packages(),
install_requires = [ install_requires = [
"sphinx-me >= 0.1.2", "sphinx-me >= 0.1.2",
"django >= 1.7, < 1.10", "django >= 1.8, < 1.11",
], ],
classifiers = [ classifiers = [
"Development Status :: 5 - Production/Stable", "Development Status :: 5 - Production/Stable",