From 86e76a7434585c502250f329bd374fb73ce60884 Mon Sep 17 00:00:00 2001 From: Tony Tung Date: Tue, 9 Jun 2020 15:29:50 -0700 Subject: [PATCH] Fix Windows tests pip can't be upgraded in place any more. --- .travis.yml | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4179e22ca..64abfbe6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ jobs: after_success: - bash <(curl -s https://codecov.io/bash) - name: Fast Tests (Windows) - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/ or branch =~ /windows/) os: windows language: sh before_install: @@ -30,12 +30,17 @@ jobs: - choco install make - export PATH="/c/Python36:/c/Python36/Scripts:$PATH" - python -m pip install --upgrade pip wheel + # these are the steps from make install-dev, EXCEPT for upgrading pip. This is required + # because pip can no longer upgrade itself. + - pip install --force-reinstall --upgrade -r requirements/REQUIREMENTS-CI.txt + - pip install -e . + - pip freeze script: - - make install-dev fast-test + - make fast-test after_success: - bash <(curl -s https://codecov.io/bash) - name: Slow Tests (Windows) - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/ or branch =~ /windows/) os: windows language: sh before_install: @@ -43,12 +48,17 @@ jobs: - choco install make - export PATH="/c/Python36:/c/Python36/Scripts:$PATH" - python -m pip install --upgrade pip wheel + # these are the steps from make install-dev, EXCEPT for upgrading pip. This is required + # because pip can no longer upgrade itself. + - pip install --force-reinstall --upgrade -r requirements/REQUIREMENTS-CI.txt + - pip install -e . + - pip freeze script: - - make install-dev slow-test + - make slow-test after_success: - bash <(curl -s https://codecov.io/bash) - name: Install Napari & Test napari (latest) - if: type = push and (branch = master or branch =~ /-alltest/ or branch =~ /napari/) + if: type = push and (branch = master or branch =~ /alltest/ or branch =~ /napari/) dist: xenial before_install: - sudo apt-get install -y libgl1-mesa-glx libqt5x11extras5 xvfb @@ -61,7 +71,7 @@ jobs: - python -c "import vispy; print(vispy.sys_info())" - make napari-test - name: Install Napari & Test napari (pinned) - if: type = push and (branch = master or branch =~ /-alltest/ or branch =~ /napari/) + if: type = push and (branch = master or branch =~ /alltest/ or branch =~ /napari/) dist: xenial before_install: - sudo apt-get install -y libgl1-mesa-glx libqt5x11extras5 xvfb @@ -75,43 +85,43 @@ jobs: - python -c "import vispy; print(vispy.sys_info())" - make napari-test - name: Docker - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make docker - name: smFISH Notebook - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: travis_wait make install-dev notebooks/py/smFISH.py - name: MERFISH Notebook - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: travis_wait make install-dev notebooks/py/MERFISH.py - name: osmFISH Notebook - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make install-dev notebooks/py/osmFISH.py - name: DARTFISH Notebook - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make install-dev notebooks/py/DARTFISH.py - name: Simulation Notebook - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make install-dev notebooks/py/Starfish_simulation.py - name: ISS Notebook - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make install-dev notebooks/py/ISS.py - name: BaristaSeq Notebook - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make install-dev notebooks/py/BaristaSeq.py - name: SeqFISH Notebook - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make install-dev notebooks/py/SeqFISH.py # - name: STARmap Notebook -# if: type = push and (branch = master or branch =~ /-alltest/) +# if: type = push and (branch = master or branch =~ /alltest/) # script: make install-dev notebooks/py/STARmap.py - name: 3D smFISH data processing example - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make install-dev 3d_smFISH.py - name: iss_pipeline.py data processing example - if: type = push and (branch = master or branch =~ /-alltest/) + if: type = push and (branch = master or branch =~ /alltest/) script: make TESTING=1 install-dev iss_pipeline.py - name: Released Notebooks - if: type = cron and (branch = master or branch =~ /-alltest/) + if: type = cron and (branch = master or branch =~ /alltest/) script: make check-notebooks install-released-notebooks-support run-notebooks cache: directories: