Skip to content

Commit

Permalink
Pin the version of pip used in the pypy virtualenv.
Browse files Browse the repository at this point in the history
Newer versions of `pip` do not work with `pypy` v2.7 on some
platforms, ref pypa/pip#8653
  • Loading branch information
rfk committed Sep 2, 2020
1 parent d69582a commit 3c31914
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ help:
all: install
install: $(INSTALL_STAMP)
$(INSTALL_STAMP): $(PYTHON) setup.py
$(INSTALL) -U pip
$(INSTALL) -Ue .
touch $(INSTALL_STAMP)

Expand All @@ -47,11 +46,14 @@ $(DEV_STAMP): $(PYTHON) dev-requirements.txt

virtualenv: $(PYTHON)
$(PYTHON):
$(VIRTUALENV) -p pypy $(VENV)
# The latest `pip` doesn't work with pypy 2.7 on some platforms.
# Pin to a working version; ref https://github.com/pypa/pip/issues/8653
$(VIRTUALENV) -p pypy --no-pip $(VENV)
$(VENV)/bin/easy_install pip==20.1.1

build-requirements:
$(VIRTUALENV) $(TEMPDIR)
$(TEMPDIR)/bin/pip install -U pip
$(VIRTUALENV) -p pypy --no-pip $(TEMPDIR)
$(TEMPDIR)/bin/easy_install pip==20.1.1
ARCHFLAGS=$(ARCHFLAGS) $(TEMPDIR)/bin/pip install -Ue .
$(TEMPDIR)/bin/pip freeze | grep -v -- '^-e' > requirements.txt

Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ pymysql-sa==1.0
pyramid==1.10.4
python-dateutil==2.8.0
python-editor==1.0.4
readline==6.2.4.1
repoze.lru==0.7
requests==2.22.0
simplejson==3.16.0
Expand Down

0 comments on commit 3c31914

Please sign in to comment.