Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

chore: upgrade simple history package #561

Merged
merged 4 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 18 additions & 0 deletions registrar/apps/core/migrations/0015_alter_user_first_name.py
Original file line number Diff line number Diff line change
@@ -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'),
),
]
3 changes: 3 additions & 0 deletions registrar/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,3 +337,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
6 changes: 2 additions & 4 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,8 @@ 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
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
django-simple-history==3.4.0
# via -r requirements/base.in
django-storages==1.8
# via
# -c requirements/constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions requirements/devstack.txt
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +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
# -c requirements/common_constraints.txt
# -r requirements/local.txt
django-simple-history==3.4.0
# via -r requirements/local.txt
django-storages==1.8
# via
# -c requirements/constraints.txt
Expand Down
6 changes: 2 additions & 4 deletions requirements/local.txt
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +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
# -c requirements/common_constraints.txt
# -r requirements/test.txt
django-simple-history==3.4.0
# via -r requirements/test.txt
django-storages==1.8
# via
# -c requirements/constraints.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/monitoring/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +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
# -c requirements/common_constraints.txt
# -r requirements/base.txt
django-simple-history==3.4.0
# via -r requirements/base.txt
django-storages==1.8
# via
# -c requirements/constraints.txt
Expand Down
6 changes: 2 additions & 4 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +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
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
django-simple-history==3.4.0
# via -r requirements/base.txt
django-storages==1.8
# via
# -c requirements/constraints.txt
Expand Down
Loading