Skip to content

Commit

Permalink
Upgrade setuptools and wheel
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Tony Tung authored and ttung committed Jun 18, 2020
1 parent 86e76a7 commit 2938ec0
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 2938ec0

Please sign in to comment.