diff --git a/Makefile b/Makefile index 7ad820af7..2e93f5b31 100644 --- a/Makefile +++ b/Makefile @@ -57,15 +57,7 @@ $(COMMON_CONSTRAINTS_TXT): upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## re-compile requirements .txt files from .in files - 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/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/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/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/Django<2.3//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 pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/registrar/apps/core/migrations/0015_alter_user_first_name.py b/registrar/apps/core/migrations/0015_alter_user_first_name.py new file mode 100644 index 000000000..fccb7b83b --- /dev/null +++ b/registrar/apps/core/migrations/0015_alter_user_first_name.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.21 on 2023-09-27 13:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0014_usergroup'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='first_name', + field=models.CharField(blank=True, max_length=150, verbose_name='first name'), + ), + ] diff --git a/registrar/settings/base.py b/registrar/settings/base.py index 16ad0cba6..8290fcb23 100644 --- a/registrar/settings/base.py +++ b/registrar/settings/base.py @@ -338,3 +338,6 @@ # How long (in seconds) we keep program details from Discovery in the cache. # Defaults to 24 hours. PROGRAM_CACHE_TIMEOUT = 60 * 60 * 24 + +# disable indexing on history_date +SIMPLE_HISTORY_DATE_INDEX = False diff --git a/requirements/base.txt b/requirements/base.txt index c58afb2a7..ade46361f 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -78,11 +78,13 @@ django-model-utils==4.3.1 # django-user-tasks django-mysql==4.11.0 # via -r requirements/base.in -django-simple-history==3.0.0 +django-simple-history==3.4.0 + # via -r requirements/base.in # via # -c requirements/common_constraints.txt # -r requirements/base.in django-storages==1.10.1 + # via # -c requirements/constraints.txt # -r requirements/base.in diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index d34ab34df..18ff1b20a 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/devstack.txt b/requirements/devstack.txt index 4b319820a..0eaf9b6f5 100644 --- a/requirements/devstack.txt +++ b/requirements/devstack.txt @@ -169,8 +169,8 @@ django-model-utils==4.3.1 # django-user-tasks django-mysql==4.11.0 # via -r requirements/local.txt -django-simple-history==3.0.0 - # via +django-simple-history==3.4.0 + # via -r requirements/local.txt # -c requirements/common_constraints.txt # -r requirements/local.txt django-storages==1.10.1 diff --git a/requirements/local.txt b/requirements/local.txt index 885f52a3f..8d86360f3 100644 --- a/requirements/local.txt +++ b/requirements/local.txt @@ -169,8 +169,8 @@ django-model-utils==4.3.1 # django-user-tasks django-mysql==4.11.0 # via -r requirements/test.txt -django-simple-history==3.0.0 - # via +django-simple-history==3.4.0 + # via -r requirements/test.txt # -c requirements/common_constraints.txt # -r requirements/test.txt django-storages==1.10.1 diff --git a/requirements/monitoring/requirements.txt b/requirements/monitoring/requirements.txt index 2447ea5ec..146ae1c86 100644 --- a/requirements/monitoring/requirements.txt +++ b/requirements/monitoring/requirements.txt @@ -258,7 +258,7 @@ django-mysql==4.11.0 # -r requirements/monitoring/../local.txt # -r requirements/monitoring/../production.txt # -r requirements/monitoring/../test.txt -django-simple-history==3.0.0 +django-simple-history==3.4.0 # via # -r requirements/monitoring/../devstack.txt # -r requirements/monitoring/../local.txt diff --git a/requirements/production.txt b/requirements/production.txt index e05f5f1be..e0622653e 100644 --- a/requirements/production.txt +++ b/requirements/production.txt @@ -107,8 +107,8 @@ django-model-utils==4.3.1 # django-user-tasks django-mysql==4.11.0 # via -r requirements/base.txt -django-simple-history==3.0.0 - # via +django-simple-history==3.4.0 + # via -r requirements/base.txt # -c requirements/common_constraints.txt # -r requirements/base.txt django-storages==1.10.1 diff --git a/requirements/test.txt b/requirements/test.txt index 77f4de87a..0fb030da8 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -134,7 +134,8 @@ django-model-utils==4.3.1 # django-user-tasks django-mysql==4.11.0 # via -r requirements/base.txt -django-simple-history==3.0.0 +django-simple-history==3.4.0 + # via -r requirements/base.txt # via # -c requirements/common_constraints.txt # -r requirements/base.txt