From 8c2763cfec4cb9ae0b67b7a0e15dfe657a07a342 Mon Sep 17 00:00:00 2001 From: miyakogi Date: Fri, 10 May 2019 09:08:37 +0900 Subject: [PATCH 1/5] Update travis to use xenial --- .travis.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2494ed11..859a001c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,32 +1,28 @@ # Config file for automatic testing at travis-ci.org # This file will be regenerated if you run travis_pypi_setup.py -sudo: required -dist: trusty - language: python matrix: include: - - os: linux - python: "3.5" + - dist: xenial + python: 3.5 env: TOXENV="py35" - - os: linux - python: "3.6" + - dist: xenial + python: 3.6 env: TOXENV="py36" - - os: linux - python: "3.7-dev" + - dist: xenial + python: 3.7 env: TOXENV="py37,doit,codecov" - os: osx - language: generic + osx_image: xcode10.2 # Python 3.7.2 running on macOS 10.14.3 + language: shell env: TOXENV="py37" + before_install: python3 --version -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python3 --version; fi install: - - python3 -m pip install tox + - python3 -m pip install --user tox script: - python3 -m tox From 4f48e9c0601a2431cda6a40a38871fc626929969 Mon Sep 17 00:00:00 2001 From: miyakogi Date: Fri, 10 May 2019 09:12:37 +0900 Subject: [PATCH 2/5] Fix travis script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 859a001c..269282aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: install: - - python3 -m pip install --user tox + - python3 -m pip install tox script: - python3 -m tox From 997b8120c11bcbc1c415e155a68d9a62a8c1147e Mon Sep 17 00:00:00 2001 From: miyakogi Date: Fri, 10 May 2019 10:34:05 +0900 Subject: [PATCH 3/5] urllib3 > 1.25 fails in ssl error now --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 82797d8a..a6288871 100644 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ 'pyee<6', 'websockets', 'appdirs', - 'urllib3', + 'urllib3<1.25', 'tqdm' ] From 911e5f224419a2349988b600891059b1e2b89724 Mon Sep 17 00:00:00 2001 From: miyakogi Date: Fri, 10 May 2019 10:46:49 +0900 Subject: [PATCH 4/5] Run Windows CI on Travis --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 269282aa..3fde05ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,10 +19,16 @@ matrix: language: shell env: TOXENV="py37" before_install: python3 --version + - os: windows + language: shell + before_install: choco install python + env: + - PATH=/c/Python37:/c/Python37/Scripts:$PATH + TOXENV="py37" install: - - python3 -m pip install tox + - pip3 install tox script: - - python3 -m tox + - tox From c0dfb404c3c7739969099a0cc4671b9380f3bc27 Mon Sep 17 00:00:00 2001 From: miyakogi Date: Fri, 10 May 2019 11:02:55 +0900 Subject: [PATCH 5/5] Allow failure of windows tests on travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3fde05ae..9fae6ebc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,8 @@ matrix: env: - PATH=/c/Python37:/c/Python37/Scripts:$PATH TOXENV="py37" + allow_failures: + - os: windows # windows build is unstable on Travis install: