Skip to content

Commit 2938ec0

Browse files
Tony Tungttung
Tony Tung
authored andcommitted
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.
1 parent 86e76a7 commit 2938ec0

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

Makefile

+4-8
Original file line numberDiff line numberDiff line change
@@ -159,19 +159,16 @@ help-integration:
159159
### INSTALL ##################################################
160160
#
161161
install-dev:
162-
pip install -U pip==$(PIP_VERSION)
163-
pip install --force-reinstall --upgrade -r requirements/REQUIREMENTS-CI.txt
162+
pip install --force-reinstall --upgrade pip==$(PIP_VERSION) -r requirements/REQUIREMENTS-CI.txt
164163
pip install -e .
165164
pip freeze
166165

167166
install-src:
168-
pip install -U pip==$(PIP_VERSION)
169-
pip install --force-reinstall --upgrade -e .
167+
pip install --force-reinstall --upgrade pip==$(PIP_VERSION) -e .
170168
pip freeze
171169

172170
install-released-notebooks-support:
173-
pip install -U pip==$(PIP_VERSION)
174-
pip install -r requirements/REQUIREMENTS-CI.txt
171+
pip install --upgrade pip==$(PIP_VERSION) -r requirements/REQUIREMENTS-CI.txt
175172
pip install starfish
176173
pip freeze
177174

@@ -283,8 +280,7 @@ release-env: release-env/bin/activate release-env/bin/make_shell
283280
# private: call virtualenv and pip install
284281
release-env/bin/activate:
285282
$(call create_venv, release-env)
286-
release-env/bin/pip install -U pip==$(PIP_VERSION)
287-
release-env/bin/pip install -r requirements/REQUIREMENTS-CI.txt
283+
release-env/bin/pip install --force-reinstall --upgrade pip==$(PIP_VERSION) -r requirements/REQUIREMENTS-CI.txt
288284
touch release-env/bin/activate
289285

290286
# private: create make_shell for activating the virtualenv below

0 commit comments

Comments
 (0)