From 51c978c2fa58eb1456389169bae3435c732d7a7e Mon Sep 17 00:00:00 2001 From: Matt Hughes <mhughes@2u.com> Date: Mon, 12 Jun 2023 11:57:03 -0400 Subject: [PATCH] build: fix make upgrade by versioning pip consistent with piptools --- Makefile | 6 +++--- pre-requirements.txt | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 pre-requirements.txt diff --git a/Makefile b/Makefile index f3918dc8869..8142015e4e4 100755 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ main.help: @echo '' requirements: - pip install -qr pre-requirements.txt --exists-action w + pip install -qr requirements/pip.txt --exists-action w pip install -qr requirements.txt --exists-action w COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt @@ -28,7 +28,7 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the pip requirements files to use the latest releases satisfying our constraints - pip install -qr pre-requirements.txt --exists-action w + pip install -qr requirements/pip.txt pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in @@ -44,7 +44,7 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) pip-compile --upgrade -o util/jenkins/requirements.txt requirements/jenkins.in # Post process all of the files generated above to work around open pip-tools issues util/post-pip-compile.sh \ - requirements/pip-tools.txt \ + requirements/pip-tools.txt \ requirements.txt \ playbooks/roles/aws/templates/requirements.txt.j2 \ util/elasticsearch/requirements.txt \ diff --git a/pre-requirements.txt b/pre-requirements.txt deleted file mode 100644 index ed2bcefab31..00000000000 --- a/pre-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -pip==21.2.1