Skip to content

Commit

Permalink
Merge pull request #13 from ambitioninc/develop
Browse files Browse the repository at this point in the history
0.5.0
  • Loading branch information
jaredlewis authored Nov 28, 2016
2 parents 1ec40c8 + 0f00150 commit 5b32a12
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,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"
install:
Expand Down
2 changes: 1 addition & 1 deletion django_kmatch/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.4.1'
__version__ = '0.5.0'
5 changes: 5 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Release Notes
=============

v0.5
----
* Added Python 3.5
* Remove django 1.7 support

v0.2
----
* Added Python 3.4
Expand Down
3 changes: 0 additions & 3 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
Sphinx>=1.2.2
sphinx_rtd_theme
django>=1.7
kmatch
jsonfield
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ 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',
Expand All @@ -39,8 +40,8 @@ def get_version():
license='MIT',
install_requires=[
'jsonfield>=0.9.20',
'Django>=1.7',
'kmatch>=0.1.6',
'Django>=1.8',
'kmatch>=0.1.6'
],
tests_require=[
'psycopg2',
Expand Down

0 comments on commit 5b32a12

Please sign in to comment.