Skip to content
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.

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

Add Django 1.9 to test suite #41

Merged
merged 5 commits into from
Dec 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 5 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
language: python
python:
- "2.7"
sudo: false
env:
- DJANGO_VERSION_CEILING=1.4 DJANGO_DB_ENGINE=sqlite
- DJANGO_VERSION_CEILING=1.4 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
- DJANGO_VERSION_CEILING=1.4 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
- DJANGO_VERSION_CEILING=1.5 DJANGO_DB_ENGINE=sqlite
- DJANGO_VERSION_CEILING=1.5 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
- DJANGO_VERSION_CEILING=1.5 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
- DJANGO_VERSION_CEILING=1.6 DJANGO_DB_ENGINE=sqlite
- DJANGO_VERSION_CEILING=1.6 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
- DJANGO_VERSION_CEILING=1.6 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
- DJANGO_VERSION_CEILING=1.7 DJANGO_DB_ENGINE=sqlite
- DJANGO_VERSION_CEILING=1.7 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
- DJANGO_VERSION_CEILING=1.7 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
- DJANGO_VERSION_CEILING=1.8 DJANGO_DB_ENGINE=sqlite
- DJANGO_VERSION_CEILING=1.8 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
- DJANGO_VERSION_CEILING=1.8 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
- DJANGO_VERSION_CEILING=1.9 DJANGO_DB_ENGINE=sqlite
- DJANGO_VERSION_CEILING=1.9 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
- DJANGO_VERSION_CEILING=1.9 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
- DJANGO_VERSION_CEILING=1.10 DJANGO_DB_ENGINE=sqlite
- DJANGO_VERSION_CEILING=1.10 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
- DJANGO_VERSION_CEILING=1.10 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis

install:
- pip install -q "Django<$DJANGO_VERSION_CEILING" MySQL-python psycopg2
- pip install "Django<$DJANGO_VERSION_CEILING" MySQL-python psycopg2
- pip install -q flake8 pylint pylint-django django-nose
- pip install -e .
before_script:
Expand Down
2 changes: 1 addition & 1 deletion pylint.rc
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ reports=no

[TYPECHECK]
# Dynamically-set members missed by the inference system.
generated-members=index,canonical_name,display_name,is_valid,cleaned_data,objects
generated-members=index,canonical_name,display_name,is_valid,cleaned_data,objects,save,prepare_value
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


install_requires = (
'Django>=1.3,<1.9',
'Django>=1.8,<1.10',
'richenum',
)

Expand Down Expand Up @@ -77,7 +77,7 @@ def run_tests(self):

setup(
name='django-richenum',
version='2.3.2',
version='2.4.0',
description='Django Enum library for python.',
long_description=(
open('README.rst').read() + '\n\n' +
Expand Down
2 changes: 1 addition & 1 deletion tests/test_form_fields.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django import forms
from django.utils.unittest import TestCase
from unittest import TestCase

from django_richenum.forms import CanonicalEnumField
from django_richenum.forms import IndexEnumField
Expand Down
2 changes: 1 addition & 1 deletion tests/test_model_form.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django import forms
from django.utils.unittest import TestCase
from unittest import TestCase

from .models import NumNode

Expand Down