From aa84f8b63a030df4e451ad9d58143a68d2239536 Mon Sep 17 00:00:00 2001
From: Iacopo Spalletti <i.spalletti@nephila.it>
Date: Sat, 17 Oct 2015 18:11:57 +0200
Subject: [PATCH] Add Python 3.5

---
 .travis.yml | 36 ++++++++++++++++++++++++++++--------
 setup.py    |  1 +
 tox.ini     |  2 +-
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 011e49d..44158b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ language: python
 sudo: false
 
 python:
+  - 3.5
   - 3.4
   - 3.3
   - 2.7
@@ -12,16 +13,16 @@ python:
 
 env:
   matrix:
-  - DJANGO='django16' CMS='cms30'
-  - DJANGO='django16' CMS='cms31'
-  - DJANGO='django16' CMS='cms32'
-  - DJANGO='django17' CMS='cms30'
-  - DJANGO='django17' CMS='cms31'
-  - DJANGO='django17' CMS='cms32'
-  - DJANGO='django18' CMS='cms31'
-  - DJANGO='django18' CMS='cms32'
   - TOXENV='pep8'
   - TOXENV='isort'
+  - DJANGO='django18' CMS='cms32'
+  - DJANGO='django18' CMS='cms31'
+  - DJANGO='django17' CMS='cms32'
+  - DJANGO='django17' CMS='cms31'
+  - DJANGO='django17' CMS='cms30'
+  - DJANGO='django16' CMS='cms32'
+  - DJANGO='django16' CMS='cms31'
+  - DJANGO='django16' CMS='cms30'
 
 
 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
@@ -31,6 +32,7 @@ install:
   - "if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then export PYVER=py27; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then export PYVER=py33; fi"
   - "if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then export PYVER=py34; fi"
+  - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then export PYVER=py35; fi"
   - "if [[ ${DJANGO}z != 'z' ]]; then export TOXENV=$PYVER-$DJANGO-$CMS; fi"
 
 # command to run tests, e.g. python setup.py test
@@ -56,6 +58,10 @@ matrix:
     env: TOXENV='pep8'
   - python: 3.3
     env: TOXENV='isort'
+  - python: 3.4
+    env: TOXENV='pep8'
+  - python: 3.4
+    env: TOXENV='isort'
   - python: 2.6
     env: DJANGO='django17' CMS='cms30'
   - python: 2.6
@@ -66,6 +72,18 @@ matrix:
     env: DJANGO='django18' CMS='cms31'
   - python: 2.6
     env: DJANGO='django18' CMS='cms32'
+  - python: 3.5
+    env: DJANGO='django16' CMS='cms30'
+  - python: 3.5
+    env: DJANGO='django16' CMS='cms31'
+  - python: 3.5
+    env: DJANGO='django16' CMS='cms32'
+  - python: 3.5
+    env: DJANGO='django17' CMS='cms30'
+  - python: 3.5
+    env: DJANGO='django17' CMS='cms31'
+  - python: 3.5
+    env: DJANGO='django17' CMS='cms32'
 
   allow_failures:
   - python: 2.6
@@ -88,3 +106,5 @@ matrix:
     env: DJANGO='django17' CMS='cms32'
   - python: 3.4
     env: DJANGO='django18' CMS='cms32'
+  - python: 3.5
+    env: DJANGO='django18' CMS='cms32'
diff --git a/setup.py b/setup.py
index 5c3a112..7ee4f3b 100755
--- a/setup.py
+++ b/setup.py
@@ -74,5 +74,6 @@ setup(
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ],
 )
diff --git a/tox.ini b/tox.ini
index 2887060..ba86678 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{26}-django16-cms{30,31},py{27,33,34}-django{16,17}-cms{30,31,32},py{27,33,34}-django{18,19}-cms{31,32},pep8,isort
+envlist = pep8,isort,py{35,34,33,27}-django{19,18}-cms{32,31},py{34,33,27}-django{17,16}-cms{32,31,30},py{26}-django16-cms{31,30}
 
 [testenv]
 commands = {env:COMMAND:python} cms_helper.py test djangocms_blog --no-migrate