diff --git a/Makefile b/Makefile index 3d01e4c0..70bd581c 100644 --- a/Makefile +++ b/Makefile @@ -116,15 +116,7 @@ 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 's/pyjwt\[crypto\]<2.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/social-auth-core<4.0.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/edx-auth-backends<4.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/edx-drf-extensions<7.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp - mv requirements/common_constraints.tmp requirements/common_constraints.txt - sed 's/drf-jwt<1.19.1//g' requirements/common_constraints.txt > requirements/common_constraints.tmp + sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp mv requirements/common_constraints.tmp 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 diff --git a/requirements/base.txt b/requirements/base.txt index c5e4dc3b..fefe3daf 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -116,10 +116,8 @@ django-model-utils==4.3.1 # edx-rbac django-ses==3.5.0 # via -r requirements/base.in -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.in +django-simple-history==3.4.0 + # via -r requirements/base.in django-waffle==4.0.0 # via # -r requirements/base.in diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index d34ab34d..18ff1b20 100644 --- a/requirements/common_constraints.txt +++ b/requirements/common_constraints.txt @@ -25,7 +25,7 @@ Django<4.0 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 + # tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos. # Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810 diff --git a/requirements/dev.txt b/requirements/dev.txt index d350a897..ac9c10f8 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -190,10 +190,8 @@ django-model-utils==4.3.1 # edx-rbac django-ses==3.5.0 # via -r requirements/validation.txt -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/validation.txt +django-simple-history==3.4.0 + # via -r requirements/validation.txt django-waffle==4.0.0 # via # -r requirements/validation.txt diff --git a/requirements/doc.txt b/requirements/doc.txt index 7350a4f2..23513438 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -180,10 +180,8 @@ django-model-utils==4.3.1 # edx-rbac django-ses==3.5.0 # via -r requirements/test.txt -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/test.txt +django-simple-history==3.4.0 + # via -r requirements/test.txt django-waffle==4.0.0 # via # -r requirements/test.txt diff --git a/requirements/production.txt b/requirements/production.txt index f7ce9cdd..125fd4e1 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -145,10 +145,8 @@ django-model-utils==4.3.1 # edx-rbac django-ses==3.5.0 # via -r requirements/base.txt -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt +django-simple-history==3.4.0 + # via -r requirements/base.txt django-waffle==4.0.0 # via # -r requirements/base.txt diff --git a/requirements/quality.txt b/requirements/quality.txt index 08154e53..43d3053e 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -157,10 +157,8 @@ django-model-utils==4.3.1 # edx-rbac django-ses==3.5.0 # via -r requirements/base.txt -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt +django-simple-history==3.4.0 + # via -r requirements/base.txt django-waffle==4.0.0 # via # -r requirements/base.txt diff --git a/requirements/test.txt b/requirements/test.txt index cca27557..1a589a92 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -166,10 +166,8 @@ django-model-utils==4.3.1 # edx-rbac django-ses==3.5.0 # via -r requirements/base.txt -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.txt +django-simple-history==3.4.0 + # via -r requirements/base.txt django-waffle==4.0.0 # via # -r requirements/base.txt diff --git a/requirements/validation.txt b/requirements/validation.txt index ca19868b..de3c6293 100644 --- a/requirements/validation.txt +++ b/requirements/validation.txt @@ -212,9 +212,8 @@ django-ses==3.5.0 # via # -r requirements/quality.txt # -r requirements/test.txt -django-simple-history==3.0.0 +django-simple-history==3.4.0 # via - # -c requirements/common_constraints.txt # -r requirements/quality.txt # -r requirements/test.txt django-waffle==4.0.0