From ce5ece1ceaadd194a7d082d31a24bb1cdf6c0be6 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Sat, 29 Aug 2020 01:33:32 +0200 Subject: [PATCH] Use new the 2020 pip dependency resolver in the bootstrap script - Also disallow pip cache in the bootstrap script --- bootstrap.sh | 6 +++--- requirements.txt | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index 77372c2619..3fac086b71 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -53,10 +53,10 @@ CMD $python -m ensurepip --root external/ --default-pip export PATH=$(pwd)/external/usr/bin:$PATH export PYTHONPATH=$(pwd)/external:$(pwd)/external/usr/lib/python$pyver/site-packages:$PYTHONPATH -CMD $python -m pip install -q --upgrade pip --target=external/ -CMD $python -m pip install -q -r requirements.txt --target=external/ --upgrade +CMD $python -m pip install --no-cache-dir -q --upgrade pip --target=external/ +CMD $python -m pip install --use-feature=2020-resolver --no-cache-dir -q -r requirements.txt --target=external/ --upgrade if [ x"$1" == x"+docs" ]; then - CMD $python -m pip install -q -r docs/requirements.txt --target=external/ --upgrade + CMD $python -m pip install --use-feature=2020-resolver --no-cache-dir -q -r docs/requirements.txt --target=external/ --upgrade make -C docs fi diff --git a/requirements.txt b/requirements.txt index 41c5dd8f7f..f9ba2da65c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ jsonschema pytest>=5.0.0 coverage setuptools +wcwidth