From 1191d659d1b4f33ea6c33d55fbf0783645b02521 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer@zimperium.com>
Date: Tue, 15 Jul 2014 11:52:54 +0300
Subject: [PATCH 1/3] Updated the build process.

The build now tests for newer Python 3.x versions and PyPy.
Also the build will now test itself against Django 1.7RC1 instead of the latest beta version.
---
 .travis.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0cce652..7a80840 100644
--- a/.travis.yml
+++ b/.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 .

From a46ade6c9491fc4c2770a16bc23ec4d12e57c241 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer@zimperium.com>
Date: Tue, 15 Jul 2014 11:54:07 +0300
Subject: [PATCH 2/3] Updated the package's classifiers.

---
 setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/setup.py b/setup.py
index bd18a83..3e77cc8 100644
--- a/setup.py
+++ b/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",

From 44b51188a98db65c8d0132a59469c69c2b56c573 Mon Sep 17 00:00:00 2001
From: Omer Katz <omer@zimperium.com>
Date: Tue, 15 Jul 2014 11:54:54 +0300
Subject: [PATCH 3/3] Added a note about PyPy support to the README file.

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index d6388be..bf4869c 100644
--- a/README.rst
+++ b/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