Skip to content

Commit 8b75aa7

Browse files
authored
Merge pull request #1140 from openedx/update-django-history-version
build: update django-simple-history package version
2 parents 80d04d2 + 2b4c5e1 commit 8b75aa7

File tree

9 files changed

+39
-7
lines changed

9 files changed

+39
-7
lines changed

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ Change Log
1313
1414
Unreleased
1515
~~~~~~~~~~
16+
17+
[4.16.1]
18+
~~~~~~~~~~~~~~~~~~~~~
19+
* Updated django-simple-history package to 3.3.0
20+
* Created no-op migrations needed for new django-simple-history package version
21+
1622
[4.16.0] - 2023-06-22
1723
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1824
* Support added for Django 4.2

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with t
4646
mv requirements/common_constraints.tmp requirements/common_constraints.txt
4747
sed 's/edx-drf-extensions<7.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
4848
mv requirements/common_constraints.tmp requirements/common_constraints.txt
49+
sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
50+
mv requirements/common_constraints.tmp requirements/common_constraints.txt
4951
pip install -qr requirements/pip-tools.txt
5052
pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in
5153
pip-compile --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in

edx_proctoring/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"""
44

55
# Be sure to update the version number in edx_proctoring/package.json
6-
__version__ = '4.16.0'
6+
__version__ = '4.16.1'
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Generated by Django 3.2.20 on 2023-07-27 21:12
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('edx_proctoring', '0024_delete_proctoredexamstudentattempthistory'),
10+
]
11+
12+
operations = [
13+
migrations.AlterModelOptions(
14+
name='historicalproctoredexam',
15+
options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical proctored exam', 'verbose_name_plural': 'historical proctored exams'},
16+
),
17+
migrations.AlterModelOptions(
18+
name='historicalproctoredexamstudentattempt',
19+
options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical proctored exam attempt', 'verbose_name_plural': 'historical proctored exam attempts'},
20+
),
21+
]

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@edx/edx-proctoring",
33
"//": "Note that the version format is slightly different than that of the Python version when using prereleases.",
4-
"version": "4.16.0",
4+
"version": "4.16.1",
55
"main": "edx_proctoring/static/index.js",
66
"scripts": {
77
"test": "gulp test"

requirements/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ django-model-utils==4.3.1
6868
# via
6969
# -r requirements/base.in
7070
# edx-when
71-
django-simple-history==3.0.0
71+
django-simple-history==3.1.1
7272
# via
73-
# -c requirements/common_constraints.txt
73+
# -c requirements/constraints.txt
7474
# -r requirements/base.in
7575
django-waffle==4.0.0
7676
# via

requirements/common_constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ 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
28+
2929

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

requirements/constraints.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,6 @@ click>=8.0,<9.0
2020

2121
# pinning because to match pin in edx-platform: https://github.com/openedx/edx-platform/blob/e25f00f35cb2ed70502bb0b28909535d55e5525e/requirements/constraints.txt#L83
2222
django-webpack-loader<1.0.0
23+
24+
# incremental upgrade plan.
25+
django-simple-history<=3.1.1

requirements/test.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ django-model-utils==4.3.1
7171
# via
7272
# -r requirements/base.in
7373
# edx-when
74-
django-simple-history==3.0.0
74+
django-simple-history==3.1.1
7575
# via
76-
# -c requirements/common_constraints.txt
76+
# -c requirements/constraints.txt
7777
# -r requirements/base.in
7878
django-waffle==4.0.0
7979
# via

0 commit comments

Comments
 (0)