From a61ed6cbcddc55ff9070ff02b258caded216ddb4 Mon Sep 17 00:00:00 2001 From: Ben Webb Date: Thu, 3 Sep 2020 10:18:30 +0000 Subject: [PATCH] requirements: Use pip's new 2020-resolver --- update_requirements.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/update_requirements.sh b/update_requirements.sh index 2ee9949..81df959 100755 --- a/update_requirements.sh +++ b/update_requirements.sh @@ -8,24 +8,25 @@ rm -rf .ve virtualenv --python=python3 .ve source .ve/bin/activate +pip install --upgrade pip if [[ "$1" == "--new-only" ]]; then # If --new-only is supplied then we install the current versions of # packages into the virtualenv, so that the only change will be any new # packages and their dependencies. - pip install -r requirements.txt + pip install --use-feature=2020-resolver -r requirements.txt dashupgrade="" else dashupgrade="--upgrade" fi -pip install $dashupgrade -r requirements.in +pip install --use-feature=2020-resolver $dashupgrade -r requirements.in pip freeze -r requirements.in > requirements.txt # Same again for requirements_dev if [[ "$1" == "--new-only" ]]; then - pip install -r requirements_dev.txt + pip install --use-feature=2020-resolver -r requirements_dev.txt fi -pip install $dashupgrade -r requirements_dev.in +pip install --use-feature=2020-resolver $dashupgrade -r requirements_dev.in cat requirements.in requirements_dev.in > requirements_combined_tmp.in pip freeze -r requirements_combined_tmp.in > requirements_dev.txt rm requirements_combined_tmp.in