diff --git a/.travis.yml b/.travis.yml index 5ddc5439..6f383996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,28 @@ sudo: false -dist: xenial language: python -python: - - "3.4" - - "3.5" - - "3.6" - - "3.7" -install: pip install tox-travis +install: + - pip3 install -r requirements.txt -r requirements-extra.txt script: tox - +matrix: + include: + - os: "linux" + dist: "xenial" + python: "3.5" + - os: "linux" + dist: "xenial" + python: "3.6" + - os: "linux" + dist: "xenial" + python: "3.7" + - os: "windows" + language: shell + python: "3.7" + env: "PATH=/c/python37:/c/python37/Scripts:$PATH" + before_install: + - choco install python make + - cp /c/python37/python.exe /c/python37/python3.exe + before_script: + - pip3 install -r requirements-windows.txt + - python3 build.py + script: + - tox -e WINDOWS diff --git a/requirements-extra.txt b/requirements-extra.txt index ed294462..44c47a4c 100644 --- a/requirements-extra.txt +++ b/requirements-extra.txt @@ -1,4 +1,4 @@ pytest>=2.0.0,<3.0 pytest-monkeyplus>=1.0.0 flake8 - +tox-travis diff --git a/tox.ini b/tox.ini index 82999f97..f6e1c436 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py34,py35,py36 +envlist = py35,py36,py37 skipsdist = True skip_missing_interpreters = True @@ -16,6 +16,11 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/requirements-extra.txt +[testenv:WINDOWS] +deps = + {[testenv]deps} + -r{toxinidir}/requirements-windows.txt + [flake8] exclude = .tox,env,build,hscommon,qtlib,cocoalib,cocoa,help,./qt/dg_rc.py,qt/run_template.py,cocoa/run_template.py,./run.py,./pkg max-line-length = 120