Skip to content

Commit d369172

Browse files
authored
Merge pull request #61 from ambitioninc/develop
2.0.0
2 parents 4667ad0 + 1422978 commit d369172

File tree

5 files changed

+18
-16
lines changed

5 files changed

+18
-16
lines changed

.travis.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,15 @@ python:
88

99
env:
1010
matrix:
11-
- DJANGO=2.0
12-
- DJANGO=2.1
1311
- DJANGO=2.2
12+
- DJANGO=3.0
13+
- DJANGO=3.1
1414
- DJANGO=master
1515

1616
addons:
1717
postgresql: '9.6'
1818

1919
matrix:
20-
exclude:
21-
- { python: "3.7", env: DJANGO=2.0 }
22-
2320
include:
2421
- { python: "3.6", env: TOXENV=flake8 }
2522

db_mutex/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.2.0'
1+
__version__ = '2.0.0'

docs/release_notes.rst

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

4+
v2.0.0
5+
------
6+
* Django 3.0, 3.1
7+
* Drop Django 2.0, 2.1
8+
49
v1.2.0
510
------
611
* Python 3.7

setup.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ def get_version():
3636
'License :: OSI Approved :: MIT License',
3737
'Operating System :: OS Independent',
3838
'Framework :: Django',
39-
'Framework :: Django :: 2.0',
40-
'Framework :: Django :: 2.1',
4139
'Framework :: Django :: 2.2',
40+
'Framework :: Django :: 3.0',
41+
'Framework :: Django :: 3.1',
4242
],
4343
license='MIT',
4444
install_requires=[
45-
'Django>=2.0',
45+
'Django>=2.2',
4646
],
4747
tests_require=[
4848
'psycopg2',

tox.ini

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[tox]
22
envlist =
33
flake8
4-
py{36}-django20
5-
py{36,37}-django21
64
py{36,37}-django22
5+
py{36,37}-django30
6+
py{36,37}-django31
77
py{36,37}-djangomaster
88

99
[testenv]
1010
setenv =
1111
DB = postgres
1212
deps =
13-
django20: Django>=2.0,<2.1
14-
django21: Django>=2.1,<2.2
15-
django22: Django>=2.2,<2.3
13+
django22: Django>=2.2,<3.0
14+
django30: Django>=3.0,<3.1
15+
django31: Django>=3.1,<3.2
1616
djangomaster: https://github.com/django/django/archive/master.tar.gz
1717
-rrequirements/requirements-testing.txt
1818
commands =
@@ -25,7 +25,7 @@ commands = flake8 db_mutex
2525

2626
[travis:env]
2727
DJANGO =
28-
2.0: django20
29-
2.1: django21
3028
2.2: django22
29+
3.0: django30
30+
3.1: django31
3131
master: djangomaster

0 commit comments

Comments
 (0)