Skip to content

Commit f5bb493

Browse files
authored
Merge pull request #58 from wesokes/develop
version support
2 parents 7112ed2 + fcea873 commit f5bb493

File tree

5 files changed

+27
-28
lines changed

5 files changed

+27
-28
lines changed

.travis.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,28 @@
1+
dist: xenial
12
language: python
2-
33
sudo: false
44

55
python:
6-
- "2.7"
7-
- "3.4"
8-
- "3.5"
96
- "3.6"
7+
- "3.7"
108

119
env:
1210
matrix:
13-
- DJANGO=1.10
14-
- DJANGO=1.11
1511
- DJANGO=2.0
12+
- DJANGO=2.1
13+
- DJANGO=2.2
1614
- DJANGO=master
1715

1816
addons:
19-
postgresql: '9.5'
17+
postgresql: '9.6'
2018

2119
matrix:
20+
exclude:
21+
- { python: "3.7", env: DJANGO=2.0 }
22+
2223
include:
2324
- { python: "3.6", env: TOXENV=flake8 }
2425

25-
exclude:
26-
- { python: "2.7", env: DJANGO=master }
27-
- { python: "2.7", env: DJANGO=2.0 }
28-
- { python: "3.4", env: DJANGO=master }
29-
- { python: "3.6", env: DJANGO=1.10 }
30-
3126
allow_failures:
3227
- env: DJANGO=master
3328

db_mutex/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '1.1.0'
1+
__version__ = '1.2.0'

docs/release_notes.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Release Notes
22
=============
33

4+
v1.2.0
5+
------
6+
* Python 3.7
7+
* Django 2.1
8+
* Django 2.2
9+
410
v1.1.0
511
------
612
* Add tox to support more versions

setup.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,21 +30,19 @@ def get_version():
3030
packages=find_packages(),
3131
classifiers=[
3232
'Programming Language :: Python',
33-
'Programming Language :: Python :: 2.7',
34-
'Programming Language :: Python :: 3.4',
35-
'Programming Language :: Python :: 3.5',
3633
'Programming Language :: Python :: 3.6',
34+
'Programming Language :: Python :: 3.7',
3735
'Intended Audience :: Developers',
3836
'License :: OSI Approved :: MIT License',
3937
'Operating System :: OS Independent',
4038
'Framework :: Django',
41-
'Framework :: Django :: 1.10',
42-
'Framework :: Django :: 1.11',
4339
'Framework :: Django :: 2.0',
40+
'Framework :: Django :: 2.1',
41+
'Framework :: Django :: 2.2',
4442
],
4543
license='MIT',
4644
install_requires=[
47-
'Django>=1.10',
45+
'Django>=2.0',
4846
],
4947
tests_require=[
5048
'psycopg2',

tox.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[tox]
22
envlist =
33
flake8
4-
py{27,34,35}-django110
5-
py{27,34,35,36}-django111
6-
py{34,35,36}-django20
7-
py{35,36}-djangomaster
4+
py{36}-django20
5+
py{36,37}-django21
6+
py{36,37}-django22
7+
py{36,37}-djangomaster
88

99
[testenv]
1010
setenv =
1111
DB = postgres
1212
deps =
13-
django110: Django>=1.10,<1.11
14-
django111: Django>=1.11,<2.0
1513
django20: Django>=2.0,<2.1
14+
django21: Django>=2.1,<2.2
15+
django22: Django>=2.2,<2.3
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-
1.10: django110
29-
1.11: django111
3028
2.0: django20
29+
2.1: django21
30+
2.2: django22
3131
master: djangomaster

0 commit comments

Comments
 (0)