From ed2a0bcd4d3ab6ffe1dd5ddf157d4122b6da56b9 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Sat, 18 May 2019 13:50:24 -0400 Subject: [PATCH 01/11] Drop python 3.4 and test py 3.7 instead --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 82999f97..016081ab 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 From 0b1223653762c82277c03fa514b0d3681e10b574 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Sat, 18 May 2019 14:35:10 -0400 Subject: [PATCH 02/11] Switch to explicit matrix build --- .travis.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5ddc5439..7120ada6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,15 @@ sudo: false -dist: xenial language: python -python: - - "3.4" - - "3.5" - - "3.6" - - "3.7" -install: pip install tox-travis +install: pip3 install tox-travis 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" From be7d558dfe0f68833872415b15177371f2f1560d Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Sat, 18 May 2019 14:36:43 -0400 Subject: [PATCH 03/11] Add Windows build to the matrix --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7120ada6..bf1a30a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,3 +13,10 @@ matrix: - 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 From 18acaae8881407833eb200f16bd6e908825253e2 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Tue, 21 May 2019 10:18:41 -0400 Subject: [PATCH 04/11] Attempt to build dupeguru before running the tox cases --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index bf1a30a2..845ecd9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,3 +20,5 @@ matrix: before_install: - choco install python make - cp /c/python37/python.exe /c/python37/python3.exe + before_script: + - python build.py From 4f234f272feed2b1d4fa5c54252c192a41105c26 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Tue, 21 May 2019 10:19:04 -0400 Subject: [PATCH 05/11] Increase tox verbosity --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 845ecd9a..1c6dc8dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: python install: pip3 install tox-travis -script: tox +script: tox -vv matrix: include: - os: "linux" From 2f439d0fc75567e18880833923b03b2a6186c0fb Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Tue, 21 May 2019 10:44:40 -0400 Subject: [PATCH 06/11] Install requisites in install task, move tox-travis into -extras --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1c6dc8dd..1f2a3fc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: false language: python -install: pip3 install tox-travis +install: + - pip3 install -r requirements.txt -r requirements-extra.txt script: tox -vv matrix: include: @@ -21,4 +22,5 @@ matrix: - choco install python make - cp /c/python37/python.exe /c/python37/python3.exe before_script: + - pip install -r requirements-windows.txt - python build.py From 3c2ef97ee249c61441557c880b02ed67d220b234 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Tue, 21 May 2019 10:45:02 -0400 Subject: [PATCH 07/11] Install requisites in install task, move tox-travis into -extras --- requirements-extra.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 718e99e880f20b7555518f0b8adcd8ede4aa5a73 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Wed, 22 May 2019 11:29:37 -0400 Subject: [PATCH 08/11] Explicitly call tox windows environment on windows --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1f2a3fc9..8439326d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false language: python install: - pip3 install -r requirements.txt -r requirements-extra.txt -script: tox -vv +script: tox matrix: include: - os: "linux" @@ -24,3 +24,5 @@ matrix: before_script: - pip install -r requirements-windows.txt - python build.py + script: + - tox -e WINDOWS From 8cdff7b48ce4c2c1180e825acc23dc7a8b13a6c0 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Wed, 22 May 2019 11:31:07 -0400 Subject: [PATCH 09/11] Define tox windows test environment --- tox.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tox.ini b/tox.ini index 016081ab..4637a0cd 100644 --- a/tox.ini +++ b/tox.ini @@ -16,6 +16,10 @@ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/requirements-extra.txt +[testenv:WINDOWS] +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 From f536f32b197b772c8e464551bdfc9b8a94c41719 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Thu, 23 May 2019 10:40:42 -0400 Subject: [PATCH 10/11] Reference standard dependencies on Windows --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 4637a0cd..f6e1c436 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,7 @@ deps = [testenv:WINDOWS] deps = + {[testenv]deps} -r{toxinidir}/requirements-windows.txt [flake8] From c61a7f1aaf9c46332636af0d2e84edc81dba7615 Mon Sep 17 00:00:00 2001 From: Joe Moore Date: Thu, 23 May 2019 10:43:28 -0400 Subject: [PATCH 11/11] Use 3-ending python names consistantly --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8439326d..6f383996 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: - choco install python make - cp /c/python37/python.exe /c/python37/python3.exe before_script: - - pip install -r requirements-windows.txt - - python build.py + - pip3 install -r requirements-windows.txt + - python3 build.py script: - tox -e WINDOWS