From 289486899c20cf30e268d94c5cd9f3f3653c2b9d Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 18 Sep 2020 12:17:44 +0200 Subject: [PATCH 1/4] no longer need cython as we have wheels for all packages --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 59e4450ccf8..f1979236888 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,6 @@ python: # we install here, although we uninstall below install: - pip install --upgrade pip - - pip install cython # this can go once we have scipy wheels for 3.8 - pip install -r requirements.txt - pip install -r test_requirements.txt --upgrade --upgrade-strategy only-if-needed - pip install -r docs_requirements.txt From 2904374950affc726888f54946762a120f1acafa Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 18 Sep 2020 12:18:22 +0200 Subject: [PATCH 2/4] remove upgrade from test_requirements this is not needed as we set specific versions --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f1979236888..0424611db3b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ python: install: - pip install --upgrade pip - pip install -r requirements.txt - - pip install -r test_requirements.txt --upgrade --upgrade-strategy only-if-needed + - pip install -r test_requirements.txt - pip install -r docs_requirements.txt - pip install . From 87589d297ffee21a978b3b4466129ba8e689e592 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 18 Sep 2020 12:19:23 +0200 Subject: [PATCH 3/4] Add 2020 beta resolver this should prevent incompatible installations --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0424611db3b..18c02bcf422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,9 +32,9 @@ python: # we install here, although we uninstall below install: - pip install --upgrade pip - - pip install -r requirements.txt - - pip install -r test_requirements.txt - - pip install -r docs_requirements.txt + - pip install -r requirements.txt --use-feature=2020-resolver + - pip install -r test_requirements.txt --use-feature=2020-resolver + - pip install -r docs_requirements.txt --use-feature=2020-resolver - pip install . before_script: # fetch full history so we can generate db fixtures From 4341b6da2bae7a4aa53f57e251c9762ee298bf62 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Fri, 18 Sep 2020 12:19:46 +0200 Subject: [PATCH 4/4] also upgrade setuptools and wheel --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18c02bcf422..05cbe3136be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ python: # We want to fail early if there is an installation problem, so # we install here, although we uninstall below install: - - pip install --upgrade pip + - pip install --upgrade pip setuptools wheel - pip install -r requirements.txt --use-feature=2020-resolver - pip install -r test_requirements.txt --use-feature=2020-resolver - pip install -r docs_requirements.txt --use-feature=2020-resolver