Merge pull request #371 from openedx/revert-281-upgrade-simple-histor…

…y-package Revert "chore: upgrade simple history package"
openedx · Dec 22, 2023 · 98e81ff · 98e81ff
2 parents 4822bdd + 5fdee5c
commit 98e81ff
Show file tree

Hide file tree

Showing 17 changed files with 419 additions and 570 deletions.
diff --git a/Makefile b/Makefile
@@ -105,16 +105,8 @@ html_coverage: ## generate and view HTML coverage report
 subsidy_client_local:  # re-install edx-enterprise-subsidy-client from local code
 	pip uninstall -y edx-enterprise-subsidy-client && pip install -e /edx/src/edx-enterprise-subsidy-client/ && pip freeze | grep subsidy-client
 
-COMMON_CONSTRAINTS_TXT=requirements/common_constraints.txt
-.PHONY: $(COMMON_CONSTRAINTS_TXT)
-$(COMMON_CONSTRAINTS_TXT):
-	wget -O "$(@)" https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt || touch "$(@)"
-	echo "$(COMMON_CONSTRAINTS_TEMP_COMMENT)" | cat - $(@) > temp && mv temp $(@)
-
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
-upgrade: piptools $(COMMON_CONSTRAINTS_TXT)  ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
-	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
+upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	# Make sure to compile files after any other files they include!
 	sed -i.tmp 's/Django<4.0//g' requirements/common_constraints.txt
 	pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in

diff --git a/...t_assignments/migrations/0014_alter_historicalassignmentconfiguration_options_and_more.py b/...t_assignments/migrations/0014_alter_historicalassignmentconfiguration_options_and_more.py
diff --git a/...icy/migrations/0020_alter_historicalassignedlearnercreditaccesspolicy_options_and_more.py b/...icy/migrations/0020_alter_historicalassignedlearnercreditaccesspolicy_options_and_more.py
diff --git a/...pps/subsidy_request/migrations/0013_alter_historicalcouponcoderequest_options_and_more.py b/...pps/subsidy_request/migrations/0013_alter_historicalcouponcoderequest_options_and_more.py
diff --git a/enterprise_access/settings/base.py b/enterprise_access/settings/base.py
@@ -487,6 +487,3 @@ def root(*path_fragments):
 # Defines error bounds for allocation price validation
 ALLOCATION_PRICE_VALIDATION_LOWER_BOUND_RATIO = .95
 ALLOCATION_PRICE_VALIDATION_UPPER_BOUND_RATIO = 1.05
-
-# disable indexing on history_date
-SIMPLE_HISTORY_DATE_INDEX = False
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -4,14 +4,12 @@
 #
 #    make upgrade
 #
-amqp==5.2.0
+amqp==5.1.1
     # via kombu
 analytics-python==1.4.post1
     # via -r requirements/base.in
 asgiref==3.7.2
-    # via
-    #   django
-    #   django-cors-headers
+    # via django
 async-timeout==4.0.3
     # via redis
 attrs==23.1.0
@@ -26,20 +24,20 @@ backports-zoneinfo[tzdata]==0.2.1
     #   celery
     #   django
     #   kombu
-billiard==4.2.0
+billiard==4.1.0
     # via celery
-celery==5.3.6
+celery==5.3.4
     # via
     #   -r requirements/base.in
     #   django-celery-results
     #   edx-celeryutils
-certifi==2023.11.17
+certifi==2023.7.22
     # via requests
 cffi==1.16.0
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==3.3.2
+charset-normalizer==3.3.1
     # via requests
 click==8.1.7
     # via
@@ -62,15 +60,15 @@ coreapi==2.3.3
     #   openapi-codec
 coreschema==0.0.4
     # via coreapi
-cryptography==41.0.7
+cryptography==41.0.5
     # via
     #   pyjwt
     #   social-auth-core
 defusedxml==0.8.0rc2
     # via
     #   python3-openid
     #   social-auth-core
-django==4.2.8
+django==4.2.6
     # via
     #   -r requirements/base.in
     #   django-celery-results
@@ -98,7 +96,7 @@ django==4.2.8
     #   social-auth-app-django
 django-celery-results==2.5.1
     # via -r requirements/base.in
-django-cors-headers==4.3.1
+django-cors-headers==4.3.0
     # via -r requirements/base.in
 django-crum==0.7.9
     # via
@@ -107,7 +105,7 @@ django-crum==0.7.9
     #   edx-rbac
 django-extensions==3.2.3
     # via -r requirements/base.in
-django-filter==23.5
+django-filter==23.3
     # via -r requirements/base.in
 django-log-request-id==2.1.0
     # via -r requirements/base.in
@@ -117,14 +115,16 @@ django-model-utils==4.3.1
     #   edx-rbac
 django-rest-swagger==2.2.0
     # via -r requirements/base.in
-django-simple-history==3.4.0
-    # via -r requirements/base.in
-django-waffle==4.1.0
+django-simple-history==3.0.0
+    # via
+    #   -c requirements/common_constraints.txt
+    #   -r requirements/base.in
+django-waffle==4.0.0
     # via
     #   -r requirements/base.in
     #   edx-django-utils
     #   edx-drf-extensions
-djangoql==0.18.0
+djangoql==0.17.1
     # via -r requirements/base.in
 djangorestframework==3.14.0
     # via
@@ -137,7 +137,7 @@ djangorestframework==3.14.0
     #   edx-drf-extensions
 drf-jwt==1.19.2
     # via edx-drf-extensions
-drf-spectacular==0.27.0
+drf-spectacular==0.26.5
     # via -r requirements/base.in
 drf-yasg==1.21.7
     # via edx-api-doc-tools
@@ -151,16 +151,16 @@ edx-celeryutils==1.2.3
     # via -r requirements/base.in
 edx-django-release-util==1.3.0
     # via -r requirements/base.in
-edx-django-utils==5.9.0
+edx-django-utils==5.7.0
     # via
     #   -r requirements/base.in
     #   edx-drf-extensions
     #   edx-rest-api-client
-edx-drf-extensions==9.0.1
+edx-drf-extensions==8.13.0
     # via
     #   -r requirements/base.in
     #   edx-rbac
-edx-enterprise-subsidy-client==0.4.1
+edx-enterprise-subsidy-client==0.4.0
     # via -r requirements/base.in
 edx-opaque-keys[django]==2.5.1
     # via
@@ -172,13 +172,13 @@ edx-rest-api-client==5.6.1
     # via
     #   -r requirements/base.in
     #   edx-enterprise-subsidy-client
-fastavro==1.9.2
+fastavro==1.9.0
     # via
     #   -r requirements/base.in
     #   openedx-events
-idna==3.6
+idna==3.4
     # via requests
-importlib-resources==6.1.1
+importlib-resources==6.1.0
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -194,39 +194,39 @@ jsonfield==3.1.0
     # via edx-celeryutils
 jsonfield2==4.0.0.post0
     # via -r requirements/base.in
-jsonschema==4.20.0
+jsonschema==4.19.2
     # via drf-spectacular
-jsonschema-specifications==2023.11.2
+jsonschema-specifications==2023.7.1
     # via jsonschema
-kombu==5.3.4
+kombu==5.3.2
     # via celery
 markupsafe==2.1.3
     # via jinja2
 monotonic==1.6
     # via analytics-python
-mysqlclient==2.2.1
+mysqlclient==2.2.0
     # via -r requirements/base.in
-newrelic==9.3.0
+newrelic==9.1.1
     # via edx-django-utils
 oauthlib==3.2.2
     # via
     #   requests-oauthlib
     #   social-auth-core
 openapi-codec==1.3.2
     # via django-rest-swagger
-openedx-events==9.2.0
+openedx-events==9.0.1
     # via -r requirements/base.in
 packaging==23.2
     # via drf-yasg
-pbr==6.0.0
+pbr==5.11.1
     # via stevedore
 pkgutil-resolve-name==1.3.10
     # via jsonschema
 ply==3.11
     # via djangoql
-prompt-toolkit==3.0.43
+prompt-toolkit==3.0.39
     # via click-repl
-psutil==5.9.7
+psutil==5.9.6
     # via edx-django-utils
 pycparser==2.21
     # via cffi
@@ -262,7 +262,7 @@ pyyaml==6.0.1
     #   edx-django-release-util
 redis==5.0.1
     # via -r requirements/base.in
-referencing==0.32.0
+referencing==0.30.2
     # via
     #   jsonschema
     #   jsonschema-specifications
@@ -277,7 +277,7 @@ requests==2.31.0
     #   social-auth-core
 requests-oauthlib==1.3.1
     # via social-auth-core
-rpds-py==0.15.2
+rpds-py==0.10.6
     # via
     #   jsonschema
     #   referencing
@@ -298,7 +298,7 @@ slumber==0.7.1
     # via edx-rest-api-client
 social-auth-app-django==5.4.0
     # via edx-auth-backends
-social-auth-core==4.5.1
+social-auth-core==4.5.0
     # via
     #   edx-auth-backends
     #   social-auth-app-django
@@ -308,10 +308,9 @@ stevedore==5.1.0
     # via
     #   edx-django-utils
     #   edx-opaque-keys
-typing-extensions==4.9.0
+typing-extensions==4.8.0
     # via
     #   asgiref
-    #   drf-spectacular
     #   edx-opaque-keys
     #   kombu
 tzdata==2023.3
@@ -323,14 +322,14 @@ uritemplate==4.1.1
     #   coreapi
     #   drf-spectacular
     #   drf-yasg
-urllib3==2.1.0
+urllib3==2.0.7
     # via requests
-vine==5.1.0
+vine==5.0.0
     # via
     #   amqp
     #   celery
     #   kombu
-wcwidth==0.2.12
+wcwidth==0.2.9
     # via prompt-toolkit
 zipp==3.17.0
     # via importlib-resources
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -1,4 +1,3 @@
-
 # A central location for most common version constraints
 # (across edx repos) for pip-installation.
 #
@@ -21,4 +20,8 @@
 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
+tox<4.0.0
diff --git a/requirements/common_constraints.txt.tmp b/requirements/common_constraints.txt.tmp