Add Django 1.6 + Python 3.3 to travis.yml and setup.py

stephenmcd · Dec 14, 2013 · 566ad86 · 566ad86
1 parent e7b670c
commit 566ad86
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,16 @@
 language: python
 env:
-  - DJANGO_VERSION=1.4.8
-  - DJANGO_VERSION=1.5.4
+  - DJANGO_VERSION=1.4.10
+  - DJANGO_VERSION=1.5.5
+  - DJANGO_VERSION=1.6.1
 python:
   - "2.6"
   - "2.7"
+  - "3.3"
+matrix:
+  exclude:
+     - python: "3.3"
+       env: DJANGO_VERSION=1.4.10
 install:
   - pip install django==$DJANGO_VERSION --use-mirrors
   - pip install -e git://github.com/stephenmcd/mezzanine.git#egg=mezzanine

diff --git a/setup.py b/setup.py
@@ -43,13 +43,17 @@
         ],
 
         classifiers=[
-            "Development Status :: 3 - Alpha",
+            "Development Status :: 4 - Beta",
             "Environment :: Web Environment",
             "Framework :: Django",
             "Intended Audience :: Developers",
             "License :: OSI Approved :: BSD License",
             "Operating System :: OS Independent",
             "Programming Language :: Python",
+            "Programming Language :: Python :: 2.6",
+            "Programming Language :: Python :: 2.7",
+            "Programming Language :: Python :: 3",
+            "Programming Language :: Python :: 3.3",
             "Topic :: Internet :: WWW/HTTP",
             "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
             "Topic :: Internet :: WWW/HTTP :: WSGI",