Skip to content

Commit 33c5eb8

Browse files
committed
Only support for Python 3.5 to Python 3.7 and Django 2.x
1 parent 0a7b9e5 commit 33c5eb8

File tree

7 files changed

+28
-98
lines changed

7 files changed

+28
-98
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
.DS_Store
77
.eggs
88
.tox
9+
/build
910
/dist
1011
/wheelhouse

.travis.yml

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,27 @@
11
language: python
22

33
python:
4-
- "2.7"
4+
- "3.5"
5+
- "3.6"
6+
- "3.7"
57

68
env:
79
matrix:
8-
- TOX_ENV=py27-dj14
9-
- TOX_ENV=py27-dj15
10-
- TOX_ENV=py27-dj16
11-
- TOX_ENV=py27-dj17
12-
- TOX_ENV=py27-dj18
13-
- TOX_ENV=py33-dj15
14-
- TOX_ENV=py33-dj16
15-
- TOX_ENV=py33-dj17
16-
- TOX_ENV=py33-dj18
17-
- TOX_ENV=py34-dj15
18-
- TOX_ENV=py34-dj16
19-
- TOX_ENV=py34-dj17
20-
- TOX_ENV=py34-dj18
21-
- TOX_ENV=pypy-dj14
22-
- TOX_ENV=pypy-dj15
23-
- TOX_ENV=pypy-dj16
24-
- TOX_ENV=pypy-dj17
25-
- TOX_ENV=pypy-dj18
26-
- TOX_ENV=py27-cov
10+
- TOX_ENV=py35-dj20
11+
- TOX_ENV=py35-dj21
12+
- TOX_ENV=py35-dj22
13+
- TOX_ENV=py36-dj20
14+
- TOX_ENV=py36-dj21
15+
- TOX_ENV=py36-dj22
16+
- TOX_ENV=py37-dj20
17+
- TOX_ENV=py37-dj21
18+
- TOX_ENV=py37-dj22
2719

2820
install:
2921
- pip install tox
3022

3123
script:
3224
- tox -e $TOX_ENV
25+
3326
after_success:
3427
- coveralls

dj_elastictranscoder/south_migrations/0001_initial.py

Lines changed: 0 additions & 49 deletions
This file was deleted.

dj_elastictranscoder/south_migrations/__init__.py

Whitespace-only changes.

setup.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ def get_version():
3737
zip_safe=False,
3838
install_requires=[
3939
"boto3 >= 1.1",
40-
"django >= 1.3, < 2.0",
40+
"django >= 1.11, < 3.0",
4141
"qiniu >= 7.0.8",
4242
],
4343
classifiers=[
4444
"Intended Audience :: Developers",
4545
"Operating System :: OS Independent",
4646
"Programming Language :: Python",
47-
"Programming Language :: Python :: 2",
48-
'Programming Language :: Python :: 2.7',
49-
'Programming Language :: Python :: 3',
50-
'Programming Language :: Python :: 3.4',
47+
"Programming Language :: Python :: 3",
48+
'Programming Language :: Python :: 3.5',
49+
'Programming Language :: Python :: 3.6',
50+
'Programming Language :: Python :: 3.7',
5151
"Topic :: Software Development :: Libraries :: Python Modules",
5252
"Environment :: Web Environment",
5353
"Framework :: Django",

testsapp/requirements.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
pytest
2-
pytest-django
1+
pytest==6.1.2
2+
pytest-django==3.10.0
33
pytest-cov
44
boto
5-
south

tox.ini

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,19 @@
11
[tox]
2-
# for py 3.x we are using only django 1.6.x as 1.5.x had only "experimental py3 support"
3-
envlist =
4-
py{27,py}-dj{14,15,16,17,18},
5-
py{33,34}-dj{15,16,17,18},
6-
py27-cov
2+
envlist = py{35,36,37}-dj{20,21,22}
73
skipsdist = True
84
usedevelop = True
95

106
[testenv]
117
commands = {posargs:py.test --create-db -vv}
128
basepython =
13-
py27: python2.7
14-
py33: python3.3
15-
py34: python3.4
16-
pypy: pypy
9+
py35: python3.5
10+
py36: python3.6
11+
py37: python3.7
1712
deps =
1813
-rtestsapp/requirements.txt
19-
dj14: django>=1.4,<1.4.999
20-
dj15: django>=1.5,<1.5.999
21-
dj16: django>=1.6,<1.6.999
22-
dj17: django>=1.7,<1.7.999
23-
dj18: django>=1.8,<1.8.999
24-
dj19: https://github.com/django/django/archive/master.tar.gz#egg=django
14+
dj20: django>=2.0,<2.1
15+
dj21: django>=2.1,<2.2
16+
dj22: django>=2.2,<3.0
2517
setenv =
2618
DJANGO_SETTINGS_MODULE = testsapp.tests_settings
2719
PYTHONPATH = {toxinidir}/testsapp:{toxinidir}
28-
29-
[testenv:py27-cov]
30-
commands = py.test --cov=dj_elastictranscoder
31-
deps =
32-
-rtestsapp/requirements.txt
33-
django>=1.8,<1.8.999

0 commit comments

Comments
 (0)