From 75561d0bea73dd964aa6799385363fc381cd5ceb Mon Sep 17 00:00:00 2001 From: Theofilos Manitaras Date: Fri, 11 Dec 2020 15:34:51 +0100 Subject: [PATCH] Remove the --use-feature=2020-resolver from bootstrap --- bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index cbcab84a4e..afdbf210ba 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -78,12 +78,12 @@ CMD $python -m pip install --no-cache-dir -q --upgrade pip --target=external/ if [ -n "$PYGELF" ]; then tmp_requirements=$(mktemp) sed -e 's/^#+pygelf%//g' requirements.txt > $tmp_requirements - CMD_M +pygelf $python -m pip install --use-feature=2020-resolver --no-cache-dir -q -r $tmp_requirements --target=external/ --upgrade && rm $tmp_requirements + CMD_M +pygelf $python -m pip install --no-cache-dir -q -r $tmp_requirements --target=external/ --upgrade && rm $tmp_requirements else - CMD $python -m pip install --use-feature=2020-resolver --no-cache-dir -q -r requirements.txt --target=external/ --upgrade + CMD $python -m pip install --no-cache-dir -q -r requirements.txt --target=external/ --upgrade fi if [ -n "$MAKEDOCS" ]; then - CMD_M +docs $python -m pip install --use-feature=2020-resolver --no-cache-dir -q -r docs/requirements.txt --target=external/ --upgrade + CMD_M +docs $python -m pip install --no-cache-dir -q -r docs/requirements.txt --target=external/ --upgrade make -C docs PYTHON=$python fi