Cache $PYENV_ROOT directory when building for OSX in Travis-CI

fastobo · Jan 18, 2020 · 3ebd532 · 3ebd532
1 parent 2bceb90
commit 3ebd532
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -41,6 +41,7 @@ stages:
     directories:
       - $HOME/.cargo/bin
       - $HOME/.cache/pip
+      - $HOME/.pyenv
       - $TRAVIS_BUILD_DIR/target
       - $HOME/Library/Caches/Homebrew
   install:

diff --git a/ci/requirements.txt b/ci/requirements.txt
@@ -1,4 +1,4 @@
-setuptools
+setuptools >=41.0
 wheel
 twine
 setuptools-rust

diff --git a/ci/travis/manylinux/install.sh b/ci/travis/manylinux/install.sh
@@ -12,4 +12,4 @@ docker exec -it manylinux sh -c \
 # --- Install Python deployment dependencies ---------------------------------
 
 log Installing Python requirements
-pip install -U -r ci/requirements.txt
+pip install -r ci/requirements.txt
diff --git a/ci/travis/osx/after_success.sh b/ci/travis/osx/after_success.sh
@@ -5,6 +5,7 @@
 # --- Using proper Python executable -----------------------------------------
 
 if [ ! "$PYTHON" = "pypy3.7" ]; then
+  log Activating pyenv
   eval "$(pyenv init -)"
   pyenv shell $(pyenv versions --bare)
 fi

diff --git a/ci/travis/osx/install.sh b/ci/travis/osx/install.sh
@@ -4,8 +4,17 @@
 
 # --- Install Python ---------------------------------------------------------
 
-log Installing pyenv from GitHub
-git clone https://github.com/pyenv/pyenv.git $PYENV_ROOT
+if [ ! -e "$PYENV_ROOT/.git" ]; then
+  log Installing pyenv from GitHub
+  git clone https://github.com/pyenv/pyenv.git $PYENV_ROOT
+else
+  log Updating pyenv
+  cd "$PYENV_ROOT"
+  git pull
+  cd "$TRAVIS_BUILD_DIR"
+fi
+
+log Activating pyenv
 eval "$(pyenv init -)"
 
 if [ "$PYTHON" = "pypy3.7" ]; then
@@ -43,7 +52,7 @@ curl -sSf https://build.travis-ci.org/files/rustup-init.sh | sh -s -- --default-
 # --- Install Python requirements --------------------------------------------
 
 log Installing Python requirements
-python -m pip install -U -r "$TRAVIS_BUILD_DIR/ci/requirements.txt"
+python -m pip install -r "$TRAVIS_BUILD_DIR/ci/requirements.txt"
 
 
 # --- Setup cargo-cache ------------------------------------------------------

diff --git a/ci/travis/osx/script.sh b/ci/travis/osx/script.sh
@@ -5,6 +5,7 @@
 # --- Using proper Python executable -----------------------------------------
 
 if [ ! "$PYTHON" = "pypy3.7" ]; then
+  log Activating pyenv
   eval "$(pyenv init -)"
   pyenv shell $(pyenv versions --bare)
 fi