Merge 454bb83 into 73ac3c0

openwisp · Oct 28, 2015 · 35ff673 · 35ff673
2 parents 73ac3c0 + 454bb83
commit 35ff673
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,24 +6,31 @@ services:
   - postgresql
 
 python:
+  - "3.5"
   - "3.4"
   - "3.3"
   - "3.2"
   - "2.7"
   - "2.6"
 
 env:
-  - DJANGO="django==1.8.4"
+  - DJANGO="django==1.8.5"
   - DJANGO="django==1.7.10"
   - DJANGO="django==1.6.11"
   - DJANGO="django==1.5.12"
 
 matrix:
   exclude:
+    - python: "3.5"
+      env: DJANGO="django==1.7.10"
+    - python: "3.5"
+      env: DJANGO="django==1.6.11"
+    - python: "3.5"
+      env: DJANGO="django==1.5.12"
     - python: "2.6"
       env: DJANGO="django==1.7.10"
     - python: "2.6"
-      env: DJANGO="django==1.8.4"
+      env: DJANGO="django==1.8.5"
 
 branches:
   only:

diff --git a/setup.py b/setup.py
@@ -55,5 +55,6 @@ def get_install_requires():
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
     ]
 )