Droped python version 3.3 and added 3.6

This commit is contained in:
DiogoMarques 2018-08-21 15:08:23 +01:00
parent 0be5939cdc
commit 54a2729283
3 changed files with 36 additions and 47 deletions

View file

@ -24,8 +24,6 @@ matrix:
env: WAGTAIL="wagtail>=1.10,<1.11"
- python: "3.5"
env: WAGTAIL="wagtail>=1.9,<1.10"
- python: "3.3" # Wagtail 1.9 was the latest tested against 3.3
env: WAGTAIL="wagtail>=1.9,<1.10"
- python: "3.5"
env: WAGTAIL="wagtail>=1.8,<1.9"
- python: "3.5"
@ -41,7 +39,6 @@ install:
- pip install --upgrade -q pip setuptools
- if [[ $DB == mysql ]] && [[ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]]; then pip install -q mysql-python; elif [[ $DB == mysql ]] && [[ ${TRAVIS_PYTHON_VERSION:0:1} == "3" ]]; then pip install -q mysqlclient; fi
- if [[ $DB == postgres ]]; then pip install -q psycopg2; fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then pip install 'Django>=1.8,<1.9'; fi
- pip install $WAGTAIL
- pip install -e .
script:

View file

@ -52,9 +52,9 @@ setup(
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Operating System :: OS Independent',
'Environment :: Web Environment',
'Intended Audience :: Developers',

76
tox.ini
View file

@ -1,34 +1,39 @@
[tox]
envlist =
py36-1.9.X,
py35-1.9.X,
py34-1.9.X,
py33-1.9.X,
py27-1.9.X,
py36-1.8.X,
py35-1.8.X,
py34-1.8.X,
py33-1.8.X,
py27-1.8.X,
py36-1.7.X,
py35-1.7.X,
py34-1.7.X,
py33-1.7.X,
py27-1.7.X,
py36-1.6.X,
py35-1.6.X,
py34-1.6.X,
py33-1.6.X,
py27-1.6.X,
py36-1.5.X,
py35-1.5.X,
py34-1.5.X,
py33-1.5.X,
py27-1.5.X,
py36-1.4.X,
py35-1.4.X,
py34-1.4.X,
py33-1.4.X,
py27-1.4.X,
[testenv]
commands =
{envpython} runtests.py
[testenv:py36-1.9.X]
basepython = python3.6
deps =
wagtail>=1.9,<1.10
[testenv:py35-1.9.X]
basepython = python3.5
deps =
@ -39,17 +44,16 @@ basepython = python3.4
deps =
wagtail>=1.9,<1.10
[testenv:py33-1.9.X]
basepython = python3.3
deps =
Django>=1.8,<1.9
wagtail>=1.9,<1.10
[testenv:py27-1.9.X]
basepython = python2.7
deps =
wagtail>=1.9,<1.10
[testenv:py36-1.8.X]
basepython = python3.6
deps =
wagtail>=1.8,<1.9
[testenv:py35-1.8.X]
basepython = python3.5
deps =
@ -60,17 +64,15 @@ basepython = python3.4
deps =
wagtail>=1.8,<1.9
[testenv:py33-1.8.X]
basepython = python3.3
deps =
Django>=1.8,<1.9
wagtail>=1.8,<1.9
[testenv:py27-1.8.X]
basepython = python2.7
deps =
wagtail>=1.8,<1.9
[testenv:py36-1.7.X]
basepython = python3.6
deps =
wagtail>=1.7,<1.8
[testenv:py35-1.7.X]
basepython = python3.5
@ -82,17 +84,15 @@ basepython = python3.4
deps =
wagtail>=1.7,<1.8
[testenv:py33-1.7.X]
basepython = python3.3
deps =
Django>=1.8,<1.9
wagtail>=1.7,<1.8
[testenv:py27-1.7.X]
basepython = python2.7
deps =
wagtail>=1.7,<1.8
[testenv:py36-1.6.X]
basepython = python3.6
deps =
wagtail>=1.6,<1.7
[testenv:py35-1.6.X]
basepython = python3.5
@ -104,17 +104,16 @@ basepython = python3.4
deps =
wagtail>=1.6,<1.7
[testenv:py33-1.6.X]
basepython = python3.3
deps =
Django>=1.8,<1.9
wagtail>=1.6,<1.7
[testenv:py27-1.6.X]
basepython = python2.7
deps =
wagtail>=1.6,<1.7
[testenv:py36-1.5.X]
basepython = python3.6
deps =
wagtail>=1.5,<1.6
[testenv:py35-1.5.X]
basepython = python3.5
deps =
@ -125,17 +124,16 @@ basepython = python3.4
deps =
wagtail>=1.5,<1.6
[testenv:py33-1.5.X]
basepython = python3.3
deps =
Django>=1.8,<1.9
wagtail>=1.5,<1.6
[testenv:py27-1.5.X]
basepython = python2.7
deps =
wagtail>=1.5,<1.6
[testenv:py36-1.4.X]
basepython = python3.6
deps =
wagtail>=1.4,<1.5
[testenv:py35-1.4.X]
basepython = python3.5
deps =
@ -146,12 +144,6 @@ basepython = python3.4
deps =
wagtail>=1.4,<1.5
[testenv:py33-1.4.X]
basepython = python3.3
deps =
Django>=1.8,<1.9
wagtail>=1.4,<1.5
[testenv:py27-1.4.X]
basepython = python2.7
deps =