From a0645b6f3b86fe953020d321ddef33ee147563dc Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Mon, 3 Aug 2020 21:25:29 -0500 Subject: [PATCH 1/2] Use pip 20.2 feature 2020-resolver Install python libraries with pip 20.2 and the 2020-resolver planned for the 20.3 release. --- docker.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker.make b/docker.make index 12f03468a..996371ace 100644 --- a/docker.make +++ b/docker.make @@ -66,8 +66,9 @@ build_libmaxmind: build_deps: build_datamaps build_libmaxmind build_python_deps: + $(PIP) install --upgrade pip==20.2 $(PIP) install --no-cache-dir --disable-pip-version-check --require-hashes \ - -r requirements/default.txt + -r requirements/default.txt --use-feature=2020-resolver $(PIP) check --disable-pip-version-check build_geocalc: From fc6150f1827cafa73a1d908d82aa7cce33e87422 Mon Sep 17 00:00:00 2001 From: John Whitlock Date: Tue, 6 Oct 2020 14:44:55 -0500 Subject: [PATCH 2/2] Install 20.2.x patch releases Thanks to @pradyunsg --- docker.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker.make b/docker.make index 996371ace..911c4b08b 100644 --- a/docker.make +++ b/docker.make @@ -66,7 +66,7 @@ build_libmaxmind: build_deps: build_datamaps build_libmaxmind build_python_deps: - $(PIP) install --upgrade pip==20.2 + $(PIP) install --upgrade pip~=20.2.0 $(PIP) install --no-cache-dir --disable-pip-version-check --require-hashes \ -r requirements/default.txt --use-feature=2020-resolver $(PIP) check --disable-pip-version-check