Merge pull request #39 from asherf/jerry

add support for Django 2.0 & python 3.6. remove support for python 3.4 and old django versions
hearsaycorp · Feb 11, 2018 · 5795918 · 5795918
2 parents 65fea16 + f03a2e6
commit 5795918
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 104 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,39 @@
 language: python
-python:
-  - 2.7
-  - 3.4
-  - 3.5
 sudo: false
-env:
-  - DJANGO_VERSION_CEILING=1.11 DJANGO_DB_ENGINE=sqlite
-  - DJANGO_VERSION_CEILING=1.11 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
-  - DJANGO_VERSION_CEILING=1.11 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
-  - DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=sqlite
-  - DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
-  - DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
+
+matrix:
+  include:
+      - python: 2.7
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=sqlite
+      - python: 2.7
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
+      - python: 2.7
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
+      - python: 3.5
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=sqlite
+      - python: 3.5
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
+      - python: 3.5
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
+      - python: 3.5
+        env: DJANGO_VERSION_CEILING=2.1 DJANGO_DB_ENGINE=sqlite
+      - python: 3.5
+        env: DJANGO_VERSION_CEILING=2.1 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
+      - python: 3.5
+        env: DJANGO_VERSION_CEILING=2.1 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
+      - python: 3.6
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=sqlite
+      - python: 3.6
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
+      - python: 3.6
+        env: DJANGO_VERSION_CEILING=1.12 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
+      - python: 3.6
+        env: DJANGO_VERSION_CEILING=2.1 DJANGO_DB_ENGINE=sqlite
+      - python: 3.6
+        env: DJANGO_VERSION_CEILING=2.1 DJANGO_DB_ENGINE=postgres DJANGO_DB_NAME=testdb DJANGO_DB_USER=postgres
+      - python: 3.6
+        env: DJANGO_VERSION_CEILING=2.1 DJANGO_DB_ENGINE=mysql DJANGO_DB_NAME=testdb DJANGO_DB_USER=travis
+
 install:
   - pip install "Django<$DJANGO_VERSION_CEILING" mysqlclient psycopg2
   - "pip install flake8 pylint pylint-django django-nose"

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+3.0.0
+------------------
+    - Add support for Python 3.6
+    - Add support for Django 2.0
+    - Remove support for Python 3.4
+    - Remove support for old Django versions
+    - Remove GIS
+
+
 2.5.0 (Not released)
 ------------------
     - Added official Python 3 support.

diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 
 
 install_requires = (
-    'Django>=1.10',
+    'Django>=1.11,<2.1',
 )
 
 
@@ -70,7 +70,7 @@ def run_tests(self):
 
 setup(
     name='django-livefield',
-    version='2.8.0',
+    version='3.0.0',
     description='Convenient soft-deletion support for Django models',
     long_description=(
         open('README.rst').read() + '\n\n' +
@@ -84,9 +84,8 @@ def run_tests(self):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     keywords='python django soft-delete',
     url='https://github.com/hearsaycorp/django-livefield',

diff --git a/src/livefield/gis/__init__.py b/src/livefield/gis/__init__.py
diff --git a/src/livefield/gis/managers.py b/src/livefield/gis/managers.py
diff --git a/src/livefield/gis/models.py b/src/livefield/gis/models.py
diff --git a/src/livefield/gis/querysets.py b/src/livefield/gis/querysets.py