From 2938ec02e1c3779ac7a642e3743aeae00b47d824 Mon Sep 17 00:00:00 2001 From: Tony Tung Date: Wed, 17 Jun 2020 17:43:51 -0700 Subject: [PATCH] Upgrade setuptools and wheel pip installs setuptools and wheel, but does not show their versions in `pip freeze`. As a result, neither of these packages show up in our requirements.txt. As such, we never install newer versions of these packages. Any package that expects a newer version of these packages will break. In this case, xarray wants setuptools 41.2+. This PR changes our install flow to force reinstall and upgrade everything requested to ensure we pick up the right packages. Test plan: `make release-env` produces a working environment. --- Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 6a8a9604f..7abebb5bd 100644 --- a/Makefile +++ b/Makefile @@ -159,19 +159,16 @@ help-integration: ### INSTALL ################################################## # install-dev: - pip install -U pip==$(PIP_VERSION) - pip install --force-reinstall --upgrade -r requirements/REQUIREMENTS-CI.txt + pip install --force-reinstall --upgrade pip==$(PIP_VERSION) -r requirements/REQUIREMENTS-CI.txt pip install -e . pip freeze install-src: - pip install -U pip==$(PIP_VERSION) - pip install --force-reinstall --upgrade -e . + pip install --force-reinstall --upgrade pip==$(PIP_VERSION) -e . pip freeze install-released-notebooks-support: - pip install -U pip==$(PIP_VERSION) - pip install -r requirements/REQUIREMENTS-CI.txt + pip install --upgrade pip==$(PIP_VERSION) -r requirements/REQUIREMENTS-CI.txt pip install starfish pip freeze @@ -283,8 +280,7 @@ release-env: release-env/bin/activate release-env/bin/make_shell # private: call virtualenv and pip install release-env/bin/activate: $(call create_venv, release-env) - release-env/bin/pip install -U pip==$(PIP_VERSION) - release-env/bin/pip install -r requirements/REQUIREMENTS-CI.txt + release-env/bin/pip install --force-reinstall --upgrade pip==$(PIP_VERSION) -r requirements/REQUIREMENTS-CI.txt touch release-env/bin/activate # private: create make_shell for activating the virtualenv below