Merge pull request #90 from wesokes/develop

django 2

Author: somewes

.travis.yml

@@ -1,17 +1,14 @@
 sudo: true
 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"
 addons:
   postgresql: '9.5'
 install:

docs/release_notes.rst

@@ -1,6 +1,14 @@
 Release Notes
 =============
 
+v1.0.0
+------
+* Drop Django 1.9
+* Drop Django 1.10
+* Add Django 2.0
+* Drop python 2.7
+* Drop python 3.4
+
 v0.15.0
 -------
 * Handle custom db column names

publish.py

@@ -1,5 +1,10 @@
 import subprocess
 
+subprocess.call(['rm', '-r', 'dist/'])
 subprocess.call(['pip', 'install', 'wheel'])
+subprocess.call(['pip', 'install', 'twine'])
 subprocess.call(['python', 'setup.py', 'clean', '--all'])
-subprocess.call(['python', 'setup.py', 'register', 'sdist', 'bdist_wheel', 'upload'])
+subprocess.call(['python', 'setup.py', 'register', 'sdist', 'bdist_wheel'])
+subprocess.call(['twine', 'upload', 'dist/*'])
+subprocess.call(['rm', '-r', 'dist/'])
+subprocess.call(['rm', '-r', 'build/'])

querybuilder/version.py

@@ -1 +1 @@
-__version__ = '0.15.0'
+__version__ = '1.0.0'

setup.py

@@ -29,22 +29,19 @@ 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',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
         'Framework :: Django',
-        'Framework :: Django :: 1.9',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Development Status :: 5 - Production/Stable',
     ],
     license='MIT',
     install_requires=[
-        'Django>=1.9',
+        'Django>=1.11',
         'pytz>=2015.6',
         'fleming>=0.4.4',
         'six',