diff --git a/.travis.yml b/.travis.yml index c5e67f93..1f5b9ac0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,23 @@ language: python + python: - "2.7" - - "3.3" - "3.4" - "3.5" + env: - DJANGO=1.7.11 - DJANGO=1.8.7 - DJANGO=1.9 + +matrix: + exclude: + - python: "3.5" # django 1.7 does not support python 3.5 + env: DJANGO=1.7.11 + install: - pip install argparse - pip install -q Django==$DJANGO - pip install -q -r requirements.txt -script: python quicktest.py helpdesk + +script: python quicktest.py helpdesk \ No newline at end of file diff --git a/README.rst b/README.rst index 0176aef7..680d35d2 100644 --- a/README.rst +++ b/README.rst @@ -25,8 +25,8 @@ LICENSE.3RDPARTY for license terms for included packages. Dependencies (pre-flight checklist) ----------------------------------- -1. Python 2.7 or 3.3+ (3.3 support is new, please let us know how it goes) -2. Django (1.7 or newer, preferably 1.9) +1. Python 2.7 or 3.4+ (3.4+ support is new, please let us know how it goes) +2. Django (1.7 or newer, preferably 1.9 - Django 1.7 is not supported if you are using Python 3.5) 3. An existing WORKING Django project with database etc. If you cannot log into the Admin, you won't get this product working. 4. `pip install django-bootstrap-form` and add `bootstrapform` to `settings.INSTALLED_APPS` diff --git a/requirements.txt b/requirements.txt index 369d90a8..8a67f496 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -Django>1.4 +Django>1.6 django-bootstrap-form>=3.1,<4 email-reply-parser django-markdown-deux