From 939643497009251bb1f768537eee5a2ce551d2f9 Mon Sep 17 00:00:00 2001 From: Thomas Hu Date: Tue, 22 Jan 2019 17:22:18 -0500 Subject: [PATCH 1/4] Update copyright --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d74ba55a..9571885a 100644 --- a/README.md +++ b/README.md @@ -102,4 +102,4 @@ after_success: ## Copyright -> Copyright 2014-2017 codecov +> Copyright 2014-2019 codecov From 9b24833a51e30dc9b3dcf70637fafa9294f4865a Mon Sep 17 00:00:00 2001 From: Thomas Hu Date: Tue, 22 Jan 2019 17:50:21 -0500 Subject: [PATCH 2/4] Switch to ubuntu --- .gitignore | 1 + .travis.yml | 2 +- appveyor.yml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 79d2d87e..433e02bb 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ coverage.xml dist htmlcov venv +*.sw[op] diff --git a/.travis.yml b/.travis.yml index 4dc412bf..f802b33d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ python: - pypy - 3.4 - 3.5 - - 3.6 + - 3.6 - pypy3 matrix: include: diff --git a/appveyor.yml b/appveyor.yml index a4c6b26e..3bda77c7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,3 +1,5 @@ +image: ubuntu + environment: global: APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appveyor/" From b6b52828f82c1f7dd8ab676116ad6d42b94b2516 Mon Sep 17 00:00:00 2001 From: Thomas Hu Date: Tue, 22 Jan 2019 23:24:02 -0500 Subject: [PATCH 3/4] Skip failing AppVeyor test due to file path issue on Windows --- appveyor.yml | 2 -- tests/test.py | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 3bda77c7..a4c6b26e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,3 @@ -image: ubuntu - environment: global: APPVEYOR_PYTHON_URL: "https://raw.githubusercontent.com/ogrisel/python-appveyor-demo/master/appveyor/" diff --git a/tests/test.py b/tests/test.py index 5d3f23e2..67a1de98 100644 --- a/tests/test.py +++ b/tests/test.py @@ -204,6 +204,7 @@ def test_disable_search(self): else: raise Exception("Did not raise AssertionError") + @unittest.skipIf(os.getenv('CI') == "True" and os.getenv('APPVEYOR') == 'True', 'Skip AppVeyor CI test') def test_prefix(self): self.fake_report() res = self.run_cli(prefix='/foo/bar/', dump=True, token='a', branch='b', commit='c') From 483b9a4331aa03d0eb43ad6ad5b05b984ffdc5b3 Mon Sep 17 00:00:00 2001 From: Thomas Hu Date: Tue, 22 Jan 2019 23:31:31 -0500 Subject: [PATCH 4/4] Remove deprecated python versions and add new ones --- appveyor.yml | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index a4c6b26e..88cac480 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,35 +13,37 @@ environment: # a later point release. - PYTHON: "C:\\Python27" - PYTHON_VERSION: "2.7.x" # currently 2.7.9 + PYTHON_VERSION: "2.7.x" # currently 2.7.15 PYTHON_ARCH: "32" - PYTHON: "C:\\Python27-x64" - PYTHON_VERSION: "2.7.x" # currently 2.7.9 + PYTHON_VERSION: "2.7.x" # currently 2.7.15 PYTHON_ARCH: "64" - - PYTHON: "C:\\Python33" - PYTHON_VERSION: "3.3.x" # currently 3.3.5 + - PYTHON: "C:\\Python34" + PYTHON_VERSION: "3.4.x" # currently 3.4.4 PYTHON_ARCH: "32" - - PYTHON: "C:\\Python33-x64" - PYTHON_VERSION: "3.3.x" # currently 3.3.5 + - PYTHON: "C:\\Python34-x64" + PYTHON_VERSION: "3.4.x" # currently 3.4.4 PYTHON_ARCH: "64" - - PYTHON: "C:\\Python34" - PYTHON_VERSION: "3.4.x" # currently 3.4.3 + - PYTHON: "C:\\Python36" + PYTHON_VERSION: "3.6.x" # currently 3.6.6 PYTHON_ARCH: "32" - - PYTHON: "C:\\Python34-x64" - PYTHON_VERSION: "3.4.x" # currently 3.4.3 + - PYTHON: "C:\\Python36-x64" + PYTHON_VERSION: "3.6.x" # currently 3.6.6 PYTHON_ARCH: "64" - # Also test Python 2.6.6 not pre-installed - - - PYTHON: "C:\\Python266" - PYTHON_VERSION: "2.6.6" + - PYTHON: "C:\\Python37" + PYTHON_VERSION: "3.7.x" # currently 3.7.1 PYTHON_ARCH: "32" + - PYTHON: "C:\\Python37-x64" + PYTHON_VERSION: "3.7.x" # currently 3.7.1 + PYTHON_ARCH: "64" + install: # Download the Appveyor Python build accessories into subdirectory .\appveyor - mkdir appveyor