Skip to content

Commit e16e763

Browse files
authored
Merge pull request #50 from ambitioninc/develop
0.5.0
2 parents 57e6fbd + a1ad4df commit e16e763

File tree

5 files changed

+21
-7
lines changed

5 files changed

+21
-7
lines changed

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ python:
44
- '2.7'
55
- '3.4'
66
- '3.5'
7+
- '3.6'
78
env:
89
global:
910
- DB=postgres
1011
matrix:
11-
- DJANGO=">=1.8,<1.9"
1212
- DJANGO=">=1.9,<1.10"
13+
- DJANGO=">=1.10,<1.11"
14+
- DJANGO=">=1.11,<2.0"
1315
install:
1416
- pip install -q coverage flake8 Django$DJANGO django-nose>=1.4
1517
- python setup.py install

db_mutex/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.4.0'
1+
__version__ = '0.5.0'

docs/examples.rst

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ Django DB Mutex can be used with celery's tasks in the following manner:
6969

7070
.. code-block:: python
7171
72+
from db_mutex import DBMutexError, DBMutexTimeoutError
73+
from db_mutex.db_mutex import db_mutex
7274
from abc import ABCMeta
7375
from celery import Task
7476

docs/release_notes.rst

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
Release Notes
22
=============
33

4+
v0.5.0
5+
------
6+
* Add python 3.6 support
7+
* Drop Django 1.8 support
8+
* Add Django 1.10 support
9+
* Add Django 1.11 support
10+
411
v0.4.0
512
------
6-
* Add python 3.5 support, drop django 1.7 support
13+
* Add python 3.5 support
14+
* Drop Django 1.7 support
715

816
v0.3.1
917
------

setup.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,26 @@ def get_version():
3333
'Programming Language :: Python :: 2.7',
3434
'Programming Language :: Python :: 3.4',
3535
'Programming Language :: Python :: 3.5',
36+
'Programming Language :: Python :: 3.6',
3637
'Intended Audience :: Developers',
3738
'License :: OSI Approved :: MIT License',
3839
'Operating System :: OS Independent',
3940
'Framework :: Django',
40-
'Framework :: Django :: 1.8',
4141
'Framework :: Django :: 1.9',
42+
'Framework :: Django :: 1.10',
43+
'Framework :: Django :: 1.11',
4244
],
4345
license='MIT',
4446
install_requires=[
4547
'django>=1.8',
4648
],
4749
tests_require=[
48-
'psycopg2>=2.4.5',
50+
'psycopg2',
4951
'django-nose>=1.4',
50-
'mock>=1.0.1',
52+
'mock',
5153
'coverage>=3.7.1',
5254
'freezegun>=0.3.2',
53-
'django-dynamic-fixture>=1.8.1'
55+
'django-dynamic-fixture'
5456
],
5557
test_suite='run_tests.run_tests',
5658
include_package_data=True,

0 commit comments

Comments
 (0)