Skip to content

Commit 32b6ce2

Browse files
authored
build: Upgrading django-simple-history. It has some breaking changes. (#1787)
build: Upgrading `django-simple-history`.
1 parent 5de53e5 commit 32b6ce2

File tree

10 files changed

+35
-20
lines changed

10 files changed

+35
-20
lines changed

Makefile

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,7 @@ upgrade: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt fil
6161
# This is a temporary solution to override the real common_constraints.txt
6262
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
6363
# See BOM-271 for more details.
64-
sed 's/pyjwt\[crypto\]<2.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
65-
mv requirements/common_constraints.tmp requirements/common_constraints.txt
66-
sed 's/social-auth-core<4.0.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
67-
mv requirements/common_constraints.tmp requirements/common_constraints.txt
68-
sed 's/edx-auth-backends<4.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
69-
mv requirements/common_constraints.tmp requirements/common_constraints.txt
70-
sed 's/edx-drf-extensions<7.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
71-
mv requirements/common_constraints.tmp requirements/common_constraints.txt
72-
sed 's/Django<2.3//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
64+
sed '/^django-simple-history==/d' requirements/common_constraints.txt > requirements/common_constraints.tmp
7365
mv requirements/common_constraints.tmp requirements/common_constraints.txt
7466
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
7567
pip-compile --rebuild --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Generated by Django 3.2.19 on 2023-06-23 09:53
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('credentials', '0025_change_usercredentialdateoverride_date'),
10+
]
11+
12+
operations = [
13+
migrations.AlterModelOptions(
14+
name='historicalprogramcompletionemailconfiguration',
15+
options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical program completion email configuration', 'verbose_name_plural': 'historical program completion email configurations'},
16+
),
17+
]

credentials/settings/base.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -559,3 +559,6 @@
559559
# Plugin Django Apps
560560
INSTALLED_APPS.extend(get_plugin_apps(PROJECT_TYPE))
561561
add_plugins(__name__, PROJECT_TYPE, SettingsType.BASE)
562+
563+
# disable indexing on history_date
564+
SIMPLE_HISTORY_DATE_INDEX = False

requirements/all.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ django-rest-swagger==2.2.0
200200
# -r requirements/production.txt
201201
django-ses==3.5.0
202202
# via -r requirements/production.txt
203-
django-simple-history==3.0.0
203+
django-simple-history==3.1.1
204204
# via
205-
# -c requirements/common_constraints.txt
205+
# -c requirements/constraints.txt
206206
# -r requirements/dev.txt
207207
# -r requirements/production.txt
208208
django-sortedm2m==3.1.1

requirements/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ django-ratelimit==3.0.1
9898
# -r requirements/base.in
9999
django-rest-swagger==2.2.0
100100
# via -r requirements/base.in
101-
django-simple-history==3.0.0
101+
django-simple-history==3.1.1
102102
# via
103-
# -c requirements/common_constraints.txt
103+
# -c requirements/constraints.txt
104104
# -r requirements/base.in
105105
django-sortedm2m==3.1.1
106106
# via -r requirements/base.in

requirements/common_constraints.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Django<4.0
2525
elasticsearch<7.14.0
2626

2727
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
28-
django-simple-history==3.0.0
2928

3029
# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
3130
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810

requirements/constraints.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,9 @@ analytics-python<=1.4.0
3636
# APER-2422
3737
urllib3<2
3838

39+
40+
django-simple-history<=3.1.1
41+
3942
# Pinning mysqlclient to version 2.1.1 as newer version was breaking our build. This constraint will be re-evaluted as part of APER-2556
4043
mysqlclient<=2.1.1
44+

requirements/dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,9 @@ django-ratelimit==3.0.1
156156
# -r requirements/test.txt
157157
django-rest-swagger==2.2.0
158158
# via -r requirements/test.txt
159-
django-simple-history==3.0.0
159+
django-simple-history==3.1.1
160160
# via
161-
# -c requirements/common_constraints.txt
161+
# -c requirements/constraints.txt
162162
# -r requirements/test.txt
163163
django-sortedm2m==3.1.1
164164
# via -r requirements/test.txt

requirements/production.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ django-rest-swagger==2.2.0
127127
# via -r requirements/base.txt
128128
django-ses==3.5.0
129129
# via -r requirements/production.in
130-
django-simple-history==3.0.0
130+
django-simple-history==3.1.1
131131
# via
132-
# -c requirements/common_constraints.txt
132+
# -c requirements/constraints.txt
133133
# -r requirements/base.txt
134134
django-sortedm2m==3.1.1
135135
# via -r requirements/base.txt

requirements/test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ django-ratelimit==3.0.1
140140
# -r requirements/base.txt
141141
django-rest-swagger==2.2.0
142142
# via -r requirements/base.txt
143-
django-simple-history==3.0.0
143+
django-simple-history==3.1.1
144144
# via
145-
# -c requirements/common_constraints.txt
145+
# -c requirements/constraints.txt
146146
# -r requirements/base.txt
147147
django-sortedm2m==3.1.1
148148
# via -r requirements/base.txt

0 commit comments

Comments
 (0)