From 4e2e517821b41bb096125e4eaecbe7aeb23aee79 Mon Sep 17 00:00:00 2001
From: Alex Seeholzer <seeholzer@gmail.com>
Date: Wed, 16 Dec 2015 10:26:29 +0100
Subject: [PATCH 1/3] changed build target to 3.4+ (3.3 support is dropped for
 Django 1.8+); changed doc to reflect this;

---
 .travis.yml | 1 -
 README.rst  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c5e67f93..09f33747 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: python
 python:
     - "2.7"
-    - "3.3"
     - "3.4"
     - "3.5"
 env:
diff --git a/README.rst b/README.rst
index 0176aef7..d2ccab1c 100644
--- a/README.rst
+++ b/README.rst
@@ -25,7 +25,7 @@ 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)
+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)
 3. An existing WORKING Django project with database etc. If you
    cannot log into the Admin, you won't get this product working.

From 265da65eade21826430b0a52fed30de62993d544 Mon Sep 17 00:00:00 2001
From: Alex Seeholzer <seeholzer@gmail.com>
Date: Wed, 16 Dec 2015 10:48:18 +0100
Subject: [PATCH 2/3] Removed Python3.5 + Django 1.7.11 from travis build
 targets (non-supported combination)

---
 .travis.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 09f33747..1f5b9ac0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,23 @@
 language: python
+
 python:
     - "2.7"
     - "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

From 87d1354020a1a92c939541440a1d5dbd45cada64 Mon Sep 17 00:00:00 2001
From: Alex Seeholzer <seeholzer@gmail.com>
Date: Wed, 16 Dec 2015 10:52:20 +0100
Subject: [PATCH 3/3] Updated doc and requirements: - Dj1.7 + Py3.5 is not
 supported - Dj>1.6 is required

---
 README.rst       | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index d2ccab1c..680d35d2 100644
--- a/README.rst
+++ b/README.rst
@@ -26,7 +26,7 @@ Dependencies (pre-flight checklist)
 -----------------------------------
 
 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)
+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