From c8aa8c1f09e3fc7a0e1e18ca1abbe24cc394a57c Mon Sep 17 00:00:00 2001
From: Lion Krischer <krischer@geophysik.uni-muenchen.de>
Date: Sat, 25 Oct 2014 20:56:03 +0200
Subject: [PATCH] Updating support Django versions and bumping version number

---
 README.md              |  8 ++++++--
 djangoplugins/utils.py |  5 +----
 docs/conf.py           |  4 ++--
 docs/index.rst         |  2 +-
 setup.py               | 10 ++++++----
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index d3af3de..92dc0ac 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## django-plugins
 
-[![Build Status](https://travis-ci.org/krischer/django-plugins.svg?branch=master)](https://travis-ci.org/krischer/django-plugins) || Latest version: **0.2.4**
+[![Build Status](https://travis-ci.org/krischer/django-plugins.svg?branch=master)](https://travis-ci.org/krischer/django-plugins) || Latest version: **0.2.5**
 
 `django-plugins` provides functionality for Django apps to make them more
 reusable.
@@ -13,7 +13,11 @@ reusable.
 
 ### Installation
 
-`django-plugins` is currently tested with Python **2.7**, **3.2**, **3.3**, and **3.4** along with Django versions **1.5.8** and **1.6.5**. It might well work with other versions. See the [Travis build matrix](https://travis-ci.org/krischer/django-plugins) for detailed information regarding the latest master.
+`django-plugins` is currently tested with Python **2.7**, **3.2**, **3.3**, and
+**3.4** along with Django versions **1.6.8** and **1.7.1**. It might well work
+with other versions. See the [Travis build
+matrix](https://travis-ci.org/krischer/django-plugins) for detailed information
+regarding the latest master.
 
 
 Installation works via `pip`:
diff --git a/djangoplugins/utils.py b/djangoplugins/utils.py
index aab831a..58714a1 100644
--- a/djangoplugins/utils.py
+++ b/djangoplugins/utils.py
@@ -4,10 +4,7 @@
 
 from django.conf import settings
 
-if django.VERSION <= (1, 5):
-    from django.conf.urls.defaults import include, patterns
-else:
-    from django.conf.urls import include, patterns
+from django.conf.urls import include, patterns
 
 from django.utils.importlib import import_module
 
diff --git a/docs/conf.py b/docs/conf.py
index 3eb22cd..bf44121 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.4'
+version = '0.2.5'
 # The full verson, including alpha/beta/rc tags.
-release = '0.2.4'
+release = '0.2.5'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/index.rst b/docs/index.rst
index f54deb8..f7323f5 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -83,7 +83,7 @@ How to use it in your app?
 --------------------------
 
 ``django-plugins`` is currently tested with Python **2.7**, **3.2**, **3.3**,
-and **3.4** along with Django versions **1.5.8** and **1.6.5**. It might well
+and **3.4** along with Django versions **1.6.8** and **1.7.1**. It might well
 work with other versions.
 
 Installation works via ``pip``:
diff --git a/setup.py b/setup.py
index a17e2f4..24d7e5a 100644
--- a/setup.py
+++ b/setup.py
@@ -9,6 +9,8 @@ def read_docs(filename):
 long_description = \
 """``django-plugins`` provides functionality for Django apps to make them more reusable.
 
+Originally developed by Mantas Zimnickas (sirexas@gmail.com).
+
 
 Home page
     http://pypi.python.org/pypi/django-plugins
@@ -22,12 +24,12 @@ def read_docs(filename):
 long_description += read_docs('CHANGES.rst')
 
 setup(name='django-plugins',
-      version='0.2.4',
-      author='Mantas Zimnickas',
-      author_email='sirexas@gmail.com',
+      version='0.2.5',
+      author='Lion Krischer',
+      author_email='lion.krischer@googlemail.com',
       packages=find_packages(exclude=['sample-project']),
       install_requires=[
-          'django>=1.5',
+          'django>=1.6',
       ],
       url='https://github.com/krischer/django-plugins',
       download_url='http://pypi.python.org/pypi/django-plugins',