From b1001d3246172f7cb8b2fcbbf913dd9bda75025c Mon Sep 17 00:00:00 2001 From: knguyen2 Date: Tue, 6 Feb 2024 23:26:22 +0000 Subject: [PATCH] fix: update makefile to remove extraenous common_constraints.txt. file --- Makefile | 4 ++-- requirements/common_constraints.txt. | 28 ---------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 requirements/common_constraints.txt. diff --git a/Makefile b/Makefile index 9850f469..be33fa6d 100644 --- a/Makefile +++ b/Makefile @@ -114,8 +114,8 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in - sed -i.'' 's/Django<4.0//g' requirements/common_constraints.txt - sed -i.'' 's/django-simple-history==//g' requirements/common_constraints.txt + sed -i 's/Django<4.0//g' requirements/common_constraints.txt + sed -i 's/django-simple-history==//g' requirements/common_constraints.txt pip install -qr requirements/pip-tools.txt # Make sure to compile files after any other files they include! $(PIP_COMPILE) --allow-unsafe -o requirements/pip.txt requirements/pip.in diff --git a/requirements/common_constraints.txt. b/requirements/common_constraints.txt. deleted file mode 100644 index eb994cfe..00000000 --- a/requirements/common_constraints.txt. +++ /dev/null @@ -1,28 +0,0 @@ -# This is a temporary solution to override the real common_constraints.txt -# In edx-lint, until the pyjwt constraint in edx-lint has been removed. -# See BOM-2721 for more details. -# Below is the copied and edited version of common_constraints - -# A central location for most common version constraints -# (across edx repos) for pip-installation. -# -# Similar to other constraint files this file doesn't install any packages. -# It specifies version constraints that will be applied if a package is needed. -# When pinning something here, please provide an explanation of why it is a good -# idea to pin this package across all edx repos, Ideally, link to other information -# that will help people in the future to remove the pin when possible. -# Writing an issue against the offending project and linking to it here is good. -# -# Note: Changes to this file will automatically be used by other repos, referencing -# this file from Github directly. It does not require packaging in edx-lint. - - -# using LTS django version - - -# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process. -# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html -elasticsearch<7.14.0 - -# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected -django-simple-history==3.0.0