From e28affd19630df2fa149257455edabe034a31a49 Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 11:41:54 +0100 Subject: [PATCH 01/10] Install newer six version --- tests/requirements_test.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/requirements_test.txt b/tests/requirements_test.txt index 0a3ec501..39b8c458 100644 --- a/tests/requirements_test.txt +++ b/tests/requirements_test.txt @@ -4,3 +4,4 @@ responses pluggy==0.11.0 pylint astroid +six>=1.10.0,<=1.14.0 From d161e7fc62e04a0d6900c5ca8201d36c4ff4b958 Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 11:47:50 +0100 Subject: [PATCH 02/10] fix six version --- .travis/requirements_travis.txt | 1 + tests/requirements_test.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/requirements_travis.txt b/.travis/requirements_travis.txt index 52819690..b2df5c8a 100644 --- a/.travis/requirements_travis.txt +++ b/.travis/requirements_travis.txt @@ -1 +1,2 @@ tox-travis +six==1.12.0 diff --git a/tests/requirements_test.txt b/tests/requirements_test.txt index 39b8c458..0a3ec501 100644 --- a/tests/requirements_test.txt +++ b/tests/requirements_test.txt @@ -4,4 +4,3 @@ responses pluggy==0.11.0 pylint astroid -six>=1.10.0,<=1.14.0 From b3ea78b4c4c6ea2ad04637d1fa991275158f515b Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 11:55:47 +0100 Subject: [PATCH 03/10] try with 1.13.0 --- .travis/requirements_travis.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/requirements_travis.txt b/.travis/requirements_travis.txt index b2df5c8a..c3e034ac 100644 --- a/.travis/requirements_travis.txt +++ b/.travis/requirements_travis.txt @@ -1,2 +1,2 @@ tox-travis -six==1.12.0 +six==1.13.0 From 020b084f8b29b995b4aa8e9b6b4db38ac17f85cc Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 12:01:43 +0100 Subject: [PATCH 04/10] try 1.14 --- .travis/requirements_travis.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/requirements_travis.txt b/.travis/requirements_travis.txt index c3e034ac..d570905e 100644 --- a/.travis/requirements_travis.txt +++ b/.travis/requirements_travis.txt @@ -1,2 +1,2 @@ tox-travis -six==1.13.0 +six==1.14.0 From 56e11e6e7ca250c3a901291a502201b0f602afde Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 12:09:46 +0100 Subject: [PATCH 05/10] remove six requirement --- .travis/requirements_travis.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis/requirements_travis.txt b/.travis/requirements_travis.txt index d570905e..52819690 100644 --- a/.travis/requirements_travis.txt +++ b/.travis/requirements_travis.txt @@ -1,2 +1 @@ tox-travis -six==1.14.0 From 5aac7d19333fbdf43975b7dd5ea4abf1f84cb1ec Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 12:23:17 +0100 Subject: [PATCH 06/10] Fix virtualenv version --- .travis/requirements_travis.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/requirements_travis.txt b/.travis/requirements_travis.txt index 52819690..0e7a5421 100644 --- a/.travis/requirements_travis.txt +++ b/.travis/requirements_travis.txt @@ -1 +1,2 @@ tox-travis +virtualenv==16.7.9 # TODO: Remove when dropping Python 2 \ No newline at end of file From 4519bf2a6dcef402ba4fe9c0d3b74232d782c159 Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 12:33:19 +0100 Subject: [PATCH 07/10] Move requirements to file --- .travis.yml | 1 - .travis/requirements_travis.txt | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f33aa72c..b72bd277 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,6 @@ install: pyenv activate conan; fi - pip install --upgrade pip - - pip install tox tox-venv - pip install -r .travis/requirements_travis.txt script: diff --git a/.travis/requirements_travis.txt b/.travis/requirements_travis.txt index 0e7a5421..ec5d20cc 100644 --- a/.travis/requirements_travis.txt +++ b/.travis/requirements_travis.txt @@ -1,2 +1,3 @@ -tox-travis +tox +tox-venv virtualenv==16.7.9 # TODO: Remove when dropping Python 2 \ No newline at end of file From 4a4f860ed593f8cd4514eccaa34b9e612c1e886f Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 12:42:27 +0100 Subject: [PATCH 08/10] relax virtualenv version --- .travis/requirements_travis.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/requirements_travis.txt b/.travis/requirements_travis.txt index ec5d20cc..c6fc5128 100644 --- a/.travis/requirements_travis.txt +++ b/.travis/requirements_travis.txt @@ -1,3 +1,3 @@ tox tox-venv -virtualenv==16.7.9 # TODO: Remove when dropping Python 2 \ No newline at end of file +virtualenv<=16.7.9 # TODO: Remove when dropping Python 2 \ No newline at end of file From 83fee5ac3ef269d09af7450f5f683293a0be10be Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 13:08:00 +0100 Subject: [PATCH 09/10] remove other packages --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b72bd277..f09fc608 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,6 +86,7 @@ install: pyenv activate conan; fi - pip install --upgrade pip + - pip uninstall -y -r <(pip freeze) - pip install -r .travis/requirements_travis.txt script: From 8088cecb4a10a0db37e4f64b5cc2d95035004335 Mon Sep 17 00:00:00 2001 From: danimtb Date: Tue, 11 Feb 2020 18:30:16 +0100 Subject: [PATCH 10/10] conditional for pip uninstall --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f09fc608..10861956 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,7 +86,10 @@ install: pyenv activate conan; fi - pip install --upgrade pip - - pip uninstall -y -r <(pip freeze) + - | + if [[ "$(pip freeze)" ]]; then + pip uninstall -y -r <(pip freeze); + fi - pip install -r .travis/requirements_travis.txt script: