Skip to content

Commit 69ec141

Browse files
committed
Update test matrix, remove unsupported Django 1.10
1 parent 037d3d8 commit 69ec141

File tree

3 files changed

+11
-14
lines changed

3 files changed

+11
-14
lines changed

.travis.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ sudo: false
33
cache: pip
44
python:
55
- '3.6'
6-
- '3.4'
6+
- '3.5'
77
- '2.7'
88
env:
9-
- PACKAGES="django>=1.10,<1.11 django-polymorphic<2.0"
109
- PACKAGES="django>=1.11,<1.12"
1110
- PACKAGES="django>=2.0,<2.1"
11+
- PACKAGES="django>=2.1,<2.2"
1212
matrix:
1313
exclude:
1414
- python: '2.7'
1515
env: PACKAGES="django>=2.0,<2.1"
16+
- python: '2.7'
17+
env: PACKAGES="django>=2.1,<2.2"
1618
before_install:
1719
- pip install codecov
1820
install:

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def find_version(*parts):
5050
'html5lib >= 0.999, != 0.9999, != 1.0b5, != 0.99999, != 1.0b6',
5151
],
5252
requires=[
53-
'Django (>=1.10)',
53+
'Django (>=1.11)',
5454
],
5555
extras_require = {
5656
'code': ['Pygments'],
@@ -98,9 +98,9 @@ def find_version(*parts):
9898
'Programming Language :: Python :: 3.5',
9999
'Programming Language :: Python :: 3.6',
100100
'Framework :: Django',
101-
'Framework :: Django :: 1.10',
102101
'Framework :: Django :: 1.11',
103102
'Framework :: Django :: 2.0',
103+
'Framework :: Django :: 2.1',
104104
'Topic :: Internet :: WWW/HTTP',
105105
'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
106106
'Topic :: Software Development :: Libraries :: Application Frameworks',

tox.ini

+5-10
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,23 @@
11
[tox]
22
envlist=
3-
py27-django{17,18,19,110,111},
4-
py33-django{17,18},
5-
py36-django{18,19,110,111,20},
6-
# py33-django-dev,
3+
py27-django{111},
4+
py36-django{111,20,21},
5+
# py35-django-dev,
76
docs,
87

98
[testenv]
109
deps =
1110
django-wysiwyg
12-
html5lib==1.0b10
11+
html5lib
1312
docutils
1413
textile
1514
MarkDown
1615
Pillow
1716
Pygments
1817
micawber
19-
django17: Django >= 1.7,<1.8
20-
django17: django-polymorphic < 1.3
21-
django18: Django >= 1.8,<1.9
22-
django19: Django >= 1.9,<1.10
23-
django110: Django >= 1.10,<1.11
2418
django111: Django >= 1.11,<1.12
2519
django20: Django >= 2.0,<2.1
20+
django21: Django >= 2.1,<2.2
2621
django-dev: https://github.com/django/django/tarball/master
2722
commands=
2823
python --version

0 commit comments

Comments
 (0)