Change how pip is installed in Makefile

Previously, the ensurepip method was used
but it is not working as expected in some
Python distributions were it is not included.
Falling back to the bootstraping get-pip.py is
safer.
This commit is contained in:
Sylvain Tricot 2021-09-23 16:53:02 +02:00
parent dfa693dfb6
commit 13f0001dde
2 changed files with 2 additions and 2 deletions

View File

@ -11,7 +11,7 @@ pybinding:
venv: venv:
ifeq ($(NO_VENV),0) ifeq ($(NO_VENV),0)
@virtualenv --python=$(PYTHON_EXE) --prompt="(msspec-$(VERSION)) " $(VENV_PATH) @virtualenv --python=$(PYTHON_EXE) --prompt="(msspec-$(VERSION)) " $(VENV_PATH)
@$(INSIDE_VENV) python -m ensurepip --upgrade --default-pip && pip install -r src/pip.freeze $(INSIDE_VENV) wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py && pip install -r src/pip.freeze && rm -f get-pip.py
endif endif

View File

@ -16,7 +16,7 @@
# along with this msspec. If not, see <http://www.gnu.org/licenses/>. # along with this msspec. If not, see <http://www.gnu.org/licenses/>.
# #
# Source file : utils/dockerized/linux/msspec # Source file : utils/dockerized/linux/msspec
# Last modified: Wed, 22 Sep 2021 14:29:59 +0200 # Last modified: Thu, 23 Sep 2021 16:53:02 +0200
# Committed by : sylvain tricot <sylvain.tricot@univ-rennes1.fr> # Committed by : sylvain tricot <sylvain.tricot@univ-rennes1.fr>
THIS_SCRIPT="$0" THIS_SCRIPT="$0"