Skip to content

update python and django support #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 18, 2017
Merged

update python and django support #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0e8fe4
update django and python
somewes Sep 15, 2017
88b9c0d
merge conflicts
somewes Sep 15, 2017
da8f908
bump version
somewes Sep 15, 2017
c0f6e0b
merge from develop
somewes Sep 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ python:
- '2.7'
- '3.4'
- '3.5'
- '3.6'
env:
global:
- DB=postgres
matrix:
- DJANGO=">=1.8,<1.9"
- DJANGO=">=1.9,<1.10"
- DJANGO=">=1.10,<1.11"
- DJANGO=">=1.11,<2.0"
install:
- pip install -q coverage flake8 Django$DJANGO django-nose>=1.4
- python setup.py install
Expand Down
2 changes: 1 addition & 1 deletion db_mutex/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.4.0'
__version__ = '0.5.0'
10 changes: 9 additions & 1 deletion docs/release_notes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
Release Notes
=============

v0.5.0
------
* Add python 3.6 support
* Drop Django 1.8 support
* Add Django 1.10 support
* Add Django 1.11 support

v0.4.0
------
* Add python 3.5 support, drop django 1.7 support
* Add python 3.5 support
* Drop Django 1.7 support

v0.3.1
------
Expand Down
10 changes: 6 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,26 @@ def get_version():
'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.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Framework :: Django :: 1.11',
],
license='MIT',
install_requires=[
'django>=1.8',
],
tests_require=[
'psycopg2>=2.4.5',
'psycopg2',
'django-nose>=1.4',
'mock>=1.0.1',
'mock',
'coverage>=3.7.1',
'freezegun>=0.3.2',
'django-dynamic-fixture>=1.8.1'
'django-dynamic-fixture'
],
test_suite='run_tests.run_tests',
include_package_data=True,
Expand Down