From ccf9f6d36df170b81e53a32c1a70c1d65f9572c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Redrejo?= Date: Thu, 17 Nov 2022 16:55:09 +0100 Subject: [PATCH] Remove code that was blocking the builders due to a solved pip issue --- Makefile | 3 --- requirements/build.txt | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7b057134bc3..efada5adad2 100644 --- a/Makefile +++ b/Makefile @@ -165,7 +165,6 @@ clean-staticdeps: staticdeps: clean-staticdeps test "${SKIP_PY_CHECK}" = "1" || python2 --version 2>&1 | grep -q 2.7 || ( echo "Only intended to run on Python 2.7" && exit 1 ) pip2 install -t kolibri/dist -r "requirements.txt" - rm -rf kolibri/dist/*.dist-info # pip installs from PyPI will complain if we have more than one dist-info directory. rm -rf kolibri/dist/*.egg-info rm -r kolibri/dist/man kolibri/dist/bin || true # remove the two folders introduced by pip 10 python2 build_tools/py2only.py # move `future` and `futures` packages to `kolibri/dist/py2only` @@ -175,8 +174,6 @@ staticdeps-cext: rm -rf kolibri/dist/cext || true # remove everything python build_tools/install_cexts.py --file "requirements/cext.txt" # pip install c extensions pip install -t kolibri/dist/cext -r "requirements/cext_noarch.txt" --no-deps - rm -rf kolibri/dist/*.dist-info # pip installs from PyPI will complain if we have more than one dist-info directory. - rm -rf kolibri/dist/cext/*.dist-info # pip installs from PyPI will complain if we have more than one dist-info directory. rm -rf kolibri/dist/*.egg-info make test-namespaced-packages diff --git a/requirements/build.txt b/requirements/build.txt index ced2905377e..24bbc52536d 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -3,6 +3,7 @@ # This does not depend on runtime stuff so we do not # include base.txt pex<1.6 +pip>=20.1 setuptools>=20.3,<41,!=34.*,!=35.* # https://github.com/pantsbuild/pex/blob/master/pex/version.py#L6 # pyup: ignore beautifulsoup4==4.8.2 requests==2.21.0