Merge pull request #78 from jaredlewis/develop

Python 3.5, drop django 1.7 support
ambitioninc · Nov 28, 2016 · 28e7f9e · 28e7f9e
2 parents e27fa4a + b14a420
commit 28e7f9e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,11 +3,11 @@ language: python
 python:
   - '2.7'
   - '3.4'
+  - '3.5'
 env:
   global:
     - DB=postgres
   matrix:
-    - DJANGO=">=1.7,<1.8"
     - DJANGO=">=1.8,<1.9"
     - DJANGO=">=1.9,<1.10"
     - DJANGO=">=1.10,<1.11"

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+v0.14.0
+-------
+* Drop support for django 1.7, add official support for python 3.5
+
 v0.13.0
 -------
 * Add paginator class for json queryset

diff --git a/querybuilder/version.py b/querybuilder/version.py
@@ -1 +1 @@
-__version__ = '0.13.0'
+__version__ = '0.14.0'
diff --git a/setup.py b/setup.py
@@ -31,21 +31,21 @@ def get_version():
         'Programming Language :: Python',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Development Status :: 5 - Production/Stable',
     ],
     license='MIT',
     install_requires=[
-        'django>=1.7',
+        'django>=1.8',
         'pytz>=2015.6',
-        'fleming>=0.4.3',
+        'fleming>=0.4.4',
         'six',
     ],
     tests_require=[