Skip to content

Commit

Permalink
upgrading setuptools as older ver is part of venv
Browse files Browse the repository at this point in the history
  • Loading branch information
shachafl committed Sep 6, 2024
1 parent 5b8d550 commit 78abf9e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ DOCKER_BUILD?=1

VERSION=$(shell sh -c "git describe --exact --dirty 2> /dev/null")
# if you update this, you will need to update the version pin for the "Install Napari & Test napari (pinned)" test in .travis.yml
PIP_VERSION=24.0
PIP_VERSION=24.2

define print_help
@printf " %-28s $(2)\n" $(1)
Expand Down Expand Up @@ -102,7 +102,7 @@ pin-all-requirements:
starfish/REQUIREMENTS-STRICT.txt : REQUIREMENTS.txt
[ ! -e .$<-env ] || exit 1
$(call create_venv, .$<-env)
.$<-env/bin/pip install --upgrade pip==$(PIP_VERSION)
.$<-env/bin/pip install --upgrade --no-cache-dir pip==$(PIP_VERSION) setuptools
.$<-env/bin/pip install -r $<
echo "# You should not edit this file directly. Instead, you should edit one of the following files ($^) and run make $@" >| $@
.$<-env/bin/pip freeze --all | grep -v "pip==$(PIP_VERSION)" >> $@
Expand All @@ -111,7 +111,7 @@ starfish/REQUIREMENTS-STRICT.txt : REQUIREMENTS.txt
requirements/REQUIREMENTS-%.txt : requirements/REQUIREMENTS-%.txt.in REQUIREMENTS.txt
[ ! -e .$<-env ] || exit 1
$(call create_venv, .$<-env)
.$<-env/bin/pip install --upgrade pip==$(PIP_VERSION)
.$<-env/bin/pip install --upgrade --no-cache-dir pip==$(PIP_VERSION) setuptools
for src in $^; do \
.$<-env/bin/pip install -r $$src; \
done
Expand Down

0 comments on commit 78abf9e

Please sign in to comment.