Skip to content

Commit 68e6897

Browse files
authored
Merge pull request #14 from hawi74/update_deps
Update supported environments
2 parents bcadd81 + 53671ec commit 68e6897

File tree

3 files changed

+16
-24
lines changed

3 files changed

+16
-24
lines changed

.travis.yml

+10-17
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,31 @@ python:
55
- "2.7"
66
- "3.4"
77
- "3.5"
8+
- "3.6"
9+
- "3.7-dev"
810

911
env:
10-
- DJANGO=1.8
1112
- DJANGO=1.11
1213
- DJANGO=2.0
14+
- DJANGO=2.1
1315
- DJANGO=master
1416

1517
matrix:
1618
fast_finish: true
17-
include:
18-
- python: "3.6"
19-
env: DJANGO=1.11
20-
- python: "3.6"
21-
env: DJANGO=2.0
22-
- python: "3.6"
23-
env: DJANGO=master
24-
- python: "3.7-dev"
25-
env: DJANGO=1.11
26-
- python: "3.7-dev"
27-
env: DJANGO=2.0
28-
- python: "3.7-dev"
29-
env: DJANGO=master
3019
exclude:
20+
- python: "2.7"
21+
env: DJANGO=2.0
22+
- python: "2.7"
23+
env: DJANGO=2.1
3124
- python: "2.7"
3225
env: DJANGO=master
26+
- python: "3.4"
27+
env: DJANGO=2.1
3328
- python: "3.4"
3429
env: DJANGO=master
35-
- python: "2.7"
36-
env: DJANGO=2.0
3730
allow_failures:
38-
- python: "3.7-dev"
3931
- env: DJANGO=master
32+
- python: "3.7-dev"
4033

4134
install:
4235
- travis_retry pip install -U tox-travis

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ def get_packages(package):
2929
url='https://github.com/sunscrapers/django-templated-mail',
3030
classifiers=[
3131
'Development Status :: 5 - Production/Stable',
32-
'Framework :: Django :: 1.8',
3332
'Framework :: Django :: 1.11',
3433
'Framework :: Django :: 2.0',
34+
'Framework :: Django :: 2.1',
3535
'Intended Audience :: Developers',
3636
'License :: OSI Approved :: MIT License',
3737
'Operating System :: OS Independent',

tox.ini

+5-6
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ python_paths = .
33

44
[tox]
55
envlist =
6-
{py27,py34,py35}-django18,
7-
{py27,py34,py35,py36,py37}-django111,
8-
{py34,py35,py36,py37}-django20,
9-
py{34,35,36,37}-djangomaster
6+
py{27,34,35,36,37}-django111
7+
py{34,35,36,37}-django20
8+
py{35,36,37}-django{21,master}
109
flake8
1110

1211

1312
[travis:env]
1413
DJANGO =
15-
1.8: django18
1614
1.11: django111
1715
2.0: django20
16+
2.1: django21
1817
master: djangomaster
1918

2019

@@ -27,9 +26,9 @@ basepython =
2726
py36: python3.6
2827
py37: python3.7
2928
deps =
30-
django18: django>=1.8,<1.9
3129
django111: django>=1.11,<2.0
3230
django20: django>=2.0,<2.1
31+
django21: django>=2.1,<2.2
3332
djangomaster: git+git://github.com/django/django.git
3433
py27: mock
3534
-rrequirements/test

0 commit comments

Comments
 (0)