Skip to content

Commit

Permalink
Merge pull request #587 from openedx/knguyen2/ent-8309
Browse files Browse the repository at this point in the history
fix: update makefile to remove extraenous common_constraints.txt. file
  • Loading branch information
katrinan029 authored Feb 7, 2024
2 parents d4a2c7e + d582b86 commit ae7fb84
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 30 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil
# 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-271 for more details.
sed -i.'' 's/Django<4.0//g' requirements/common_constraints.txt
sed -i.'' 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt
sed -i 's/Django<4.0//g' requirements/common_constraints.txt
sed -i 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt
# Make sure to compile files after any other files they include!
pip-compile --upgrade --rebuild --allow-unsafe -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
Expand Down
28 changes: 0 additions & 28 deletions requirements/common_constraints.txt.

This file was deleted.

0 comments on commit ae7fb84

Please sign in to comment.