Merge pull request #16 from wesokes/develop

django 2
ambitioninc · Dec 8, 2017 · 3285193 · 3285193
2 parents 6582093 + 84d2bc8
commit 3285193
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,13 @@
 language: python
 python:
-  - '2.7'
-  - '3.4'
   - '3.5'
   - '3.6'
 env:
   global:
     - DB=postgres
   matrix:
-    - DJANGO=">=1.9,<1.10"
-    - DJANGO=">=1.10,<1.11"
     - DJANGO=">=1.11,<2.0"
+    - DJANGO=">=2.0,<2.1"
 install:
   - pip install -q coverage flake8 Django$DJANGO django-nose>=1.4
   - pip install -r requirements/docs.txt

diff --git a/django_kmatch/version.py b/django_kmatch/version.py
@@ -1 +1 @@
-__version__ = '0.6.0'
+__version__ = '1.0.0'
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1,6 +1,14 @@
 Release Notes
 =============
 
+v1.0.0
+------
+* Remove python 2.7 support
+* Remove python 3.4 support
+* Remove Django 1.9 support
+* Remove Django 1.10 support
+* Add Django 2.0 support
+
 v0.6.0
 ------
 * Add Python 3.6 support

diff --git a/setup.py b/setup.py
@@ -29,8 +29,6 @@ def get_version():
     packages=find_packages(),
     classifiers=[
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Intended Audience :: Developers',
@@ -41,7 +39,7 @@ def get_version():
     license='MIT',
     install_requires=[
         'jsonfield>=0.9.20',
-        'Django>=1.9',
+        'Django>=1.11',
         'kmatch>=0.1.7'
     ],
     tests_require=[