Skip to content

Commit d6b0d7d

Browse files
committed
start 2.1
1 parent 85ed249 commit d6b0d7d

File tree

4 files changed

+13
-20
lines changed

4 files changed

+13
-20
lines changed

.travis.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ sudo: true
33
python:
44
- 3.5
55
- 3.6
6-
6+
- 3.7
7+
-
78
addons:
89
postgresql: "9.4"
910

@@ -42,26 +43,14 @@ env:
4243
- DJANGO=1.11 DB=pg
4344
- DJANGO=2.0 DB=pg
4445
- DJANGO=2.1 DB=pg
46+
- DJANGO=2.2 DB=pg
4547

4648
- DJANGO=1.11 DB=mysql
4749
- DJANGO=2.0 DB=mysql
4850
- DJANGO=2.1 DB=mysql
51+
- DJANGO=2.2 DB=mysql
4952

5053

51-
matrix:
52-
exclude:
53-
- python: 2.7
54-
env: DJANGO=2.0 DB=pg
55-
56-
- python: 2.7
57-
env: DJANGO=2.0 DB=mysql
58-
59-
- python: 2.7
60-
env: DJANGO=2.1 DB=pg
61-
62-
- python: 2.7
63-
env: DJANGO=2.1 DB=mysql
64-
6554
install:
6655
- pip install tox "coverage<=4.0" codecov
6756

CHANGES

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Release 2.1
2+
-----------
3+
* drop support Python 2.7
4+
* add support Django 2.2
5+
16
Release 2.0
27
-----------
38
* drop official support to Django < 1.10

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171

7272
# General information about the project.
7373
project = u'Django Concurrency'
74-
copyright = u'2012-2015, Stefano Apostolico'
74+
copyright = u'2012-2019, Stefano Apostolico'
7575

7676
# The version info for the project you're documenting, acts as replacement for
7777
# |version| and |release|, also used in various other places throughout the

tox.ini

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
2-
envlist = d{111}-py{27,35,36,37,py}-{pg,sqlite,mysql},
3-
d{20,21}-py{35,36,37}-{pg,sqlite,mysql}
2+
envlist = d{111}-py{35,36,37,py}-{pg,sqlite,mysql},
3+
d{20,21,22}-py{35,36,37}-{pg,sqlite,mysql}
44

55

66
[pytest]
@@ -55,11 +55,10 @@ deps=
5555
pypy-pg: psycopg2cffi
5656
mysql: mysqlclient
5757
docs: -rdocs/requirements.pip
58-
d110: django>=1.10,<1.11
5958
d111: django>=1.11,<1.12
6059
d20: django>=2.0,<2.1
61-
d20: django>=2.0,<2.1
6260
d21: django>=2.1,<2.2
61+
d22: django>=2.1,<2.2rc1
6362

6463

6564
commands =

0 commit comments

Comments
 (0)