Merge pull request #70 from omerzimp/patch-1

Test Python 3.3, 3.4, and PyPy; test Django 1.7rc1

.travis.yml

@@ -3,12 +3,15 @@ python:
   - "2.6"
   - "2.7"
   - "3.2"
+  - "3.3"
+  - "3.4"
+  - "pypy"
 env:
   - DJANGO=django==1.3
   - DJANGO=django==1.4
   - DJANGO=django==1.5
   - DJANGO=django==1.6
-  - DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball/
+  - DJANGO=https://www.djangoproject.com/download/1.7c1/tarball/
 matrix:
   exclude:
     # Django < 1.5 not supported on python 3
@@ -16,13 +19,25 @@ matrix:
       env: DJANGO=django==1.3
     - python: "3.2"
       env: DJANGO=django==1.4
+    - python: "3.3"
+      env: DJANGO=django==1.3
+    - python: "3.3"
+      env: DJANGO=django==1.4
+    - python: "3.4"
+      env: DJANGO=django==1.3
+    - python: "3.4"
+      env: DJANGO=django==1.4
+    - python: "pypy"
+      env: DJANGO=django==1.3
+    - python: "pypy"
+      env: DJANGO=django==1.4
     # Django >= 1.5 strongly recommends python 2.7 or later (so skip 2.6)
     - python: "2.6"
       env: DJANGO=django==1.5
     - python: "2.6"
       env: DJANGO=django==1.6
     - python: "2.6"
-      env: DJANGO=https://www.djangoproject.com/download/1.7.b4/tarball/
+      env: DJANGO=https://www.djangoproject.com/download/1.7c1/tarball/
 install:
   - pip install -q $DJANGO
   - pip install .

README.rst

@@ -31,7 +31,7 @@ package. It includes:
 * An optional Django admin interface
 
 Djrill is released under the BSD license. It is tested against Django 1.3---1.7b1
-(including Python 3 support with Django 1.5+).
+(including Python 3 and PyPy support with Django 1.5+).
 
 .. END shared-intro
 

setup.py

@@ -35,10 +35,14 @@ setup(
     tests_require=["mock"],
     classifiers=[
         "Programming Language :: Python",
+        "Programming Language :: Python :: Implementation :: PyPy",
+        "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         "License :: OSI Approved :: BSD License",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Framework :: Django",