Drop Python 2.7, Django < 2.0 support

Require Python 3.4+ and Django 2.0+
pinax · Mar 16, 2018 · e7cb9fa · e7cb9fa
1 parent c330f3a
commit e7cb9fa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -44,10 +44,7 @@ and learning more about the latest Pinax app releases.
 
 #### Supported Django and Python versions
 
-Django \ Python | 2.7 | 3.4 | 3.5 | 3.6
---------------- | --- | --- | --- | ---
-1.11 |  *  |  *  |  *  |  *  
-2.0  |     |  *  |  *  |  *
+pinax-cli creates projects using Python v3.4+ and Django v2.0+
 
 
 ## Documentation
@@ -116,13 +113,17 @@ Create a new project based on a specific Pinax starter project.
 `<starter_project>` must be one of the project names shown by `pinax projects`.
 
 The `--dev` flag tells pinax-cli to install the latest starter project code from the repository rather than the most recent release.
-Use this option if you want the latest version of a starter project.
+Use this option if you require the latest version of a starter project.
 
 The `--location <path>` flag tells pinax-cli where to create the new project. By default
 the project is created in a sub-directory named `my_project`. 
 
 ## Change Log
 
+### 1.1.3
+
+* Drop support for Python 2.7 and Django < 2.0; require Python 3.4+ and Django 2.0+
+
 ### 1.1.2
 
 * Use Django v1.11 for project creation if installed Python == 2.7

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 import sys
 from setuptools import setup
 
-VERSION = "1.1.2"
+VERSION = "1.1.3"
 LONG_DESCRIPTION = """
 .. image:: http://pinaxproject.com/pinax-design/patches/pinax-blank.svg
     :target: https://pypi.python.org/pypi/pinax-cli/
@@ -43,15 +43,15 @@
 Supported Django and Python Versions
 ------------------------------------
 
-+-----------------+-----+-----+-----+-----+
-| Django / Python | 2.7 | 3.4 | 3.5 | 3.6 |
-+=================+=====+=====+=====+=====+
-|  1.11           |  *  |  *  |  *  |  *  |
-+-----------------+-----+-----+-----+-----+
-|  2.0            |     |  *  |  *  |  *  |
-+-----------------+-----+-----+-----+-----+
+pinax-cli creates projects using Python v3.4+ and Django v2.0+
+
 """
 
+# Check for valid Python.
+if sys.version_info < (3, 4, 0):
+    print("Python {} is installed, but pinax-cli requires Python 3.4 or greater for compatibility with Django v2.x".format(sys.version.split()[0]))
+    sys.exit()
+
 
 # Publish Helper.
 if sys.argv[-1] == 'publish':
@@ -72,8 +72,7 @@
     install_requires=[
         "click>=6.7",
         "crayons>=0.1.2",
-        'django==1.11; python_version == "2.7"',
-        'django>=2.0; python_version >= "3"',
+        "django>=2.0",
         "requests>=2.18.4",
     ],
     entry_points={