Skip to content

Commit 2406167

Browse files
authored
Merge pull request #79 from ambitioninc/develop
0.14.0
2 parents 4028f24 + 28e7f9e commit 2406167

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ language: python
33
python:
44
- '2.7'
55
- '3.4'
6+
- '3.5'
67
env:
78
global:
89
- DB=postgres
910
matrix:
10-
- DJANGO=">=1.7,<1.8"
1111
- DJANGO=">=1.8,<1.9"
1212
- DJANGO=">=1.9,<1.10"
1313
- DJANGO=">=1.10,<1.11"

docs/release_notes.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Release Notes
22
=============
33

4+
v0.14.0
5+
-------
6+
* Drop support for django 1.7, add official support for python 3.5
7+
48
v0.13.0
59
-------
610
* Add paginator class for json queryset

querybuilder/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.13.0'
1+
__version__ = '0.14.0'

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ def get_version():
3131
'Programming Language :: Python',
3232
'Programming Language :: Python :: 2.7',
3333
'Programming Language :: Python :: 3.4',
34+
'Programming Language :: Python :: 3.5',
3435
'Intended Audience :: Developers',
3536
'License :: OSI Approved :: MIT License',
3637
'Operating System :: OS Independent',
3738
'Framework :: Django',
38-
'Framework :: Django :: 1.7',
3939
'Framework :: Django :: 1.8',
4040
'Framework :: Django :: 1.9',
4141
'Framework :: Django :: 1.10',
4242
'Development Status :: 5 - Production/Stable',
4343
],
4444
license='MIT',
4545
install_requires=[
46-
'django>=1.7',
46+
'django>=1.8',
4747
'pytz>=2015.6',
48-
'fleming>=0.4.3',
48+
'fleming>=0.4.4',
4949
'six',
5050
],
5151
tests_require=[

0 commit comments

Comments
 (0)