From 2173330095d07fce8ed9cd6b0f422060e4e4a5b3 Mon Sep 17 00:00:00 2001 From: UsamaSadiq Date: Thu, 27 Jul 2023 21:38:27 +0500 Subject: [PATCH 1/2] feat: update django-simple-history to latest --- CHANGELOG.rst | 6 ++++++ Makefile | 2 ++ edx_proctoring/__init__.py | 2 +- .../migrations/0025_auto_20230727_2112.py | 21 +++++++++++++++++++ package.json | 2 +- requirements/base.txt | 9 ++++---- requirements/common_constraints.txt | 2 +- requirements/dev.txt | 4 ++-- requirements/quality.txt | 4 ++-- requirements/test.txt | 11 +++++----- 10 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 edx_proctoring/migrations/0025_auto_20230727_2112.py diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 794840f3d36..37ca2ce4b4c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -13,6 +13,12 @@ Change Log Unreleased ~~~~~~~~~~ + +[4.16.1] +~~~~~~~~~~~~~~~~~~~~~ +* Updated django-simple-history package to 3.3.0 +* Created no-op migrations needed for new django-simple-history package version + [4.16.0] - 2023-06-22 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * Support added for Django 4.2 diff --git a/Makefile b/Makefile index c675369b780..b24161a4de4 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,8 @@ upgrade: $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with t 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/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 install -qr requirements/pip-tools.txt pip-compile --allow-unsafe --rebuild --upgrade -o requirements/pip.txt requirements/pip.in pip-compile --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in diff --git a/edx_proctoring/__init__.py b/edx_proctoring/__init__.py index c211ad4e5a6..bfe47ee1248 100644 --- a/edx_proctoring/__init__.py +++ b/edx_proctoring/__init__.py @@ -3,4 +3,4 @@ """ # Be sure to update the version number in edx_proctoring/package.json -__version__ = '4.16.0' +__version__ = '4.16.1' diff --git a/edx_proctoring/migrations/0025_auto_20230727_2112.py b/edx_proctoring/migrations/0025_auto_20230727_2112.py new file mode 100644 index 00000000000..0b209bf408d --- /dev/null +++ b/edx_proctoring/migrations/0025_auto_20230727_2112.py @@ -0,0 +1,21 @@ +# Generated by Django 3.2.20 on 2023-07-27 21:12 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('edx_proctoring', '0024_delete_proctoredexamstudentattempthistory'), + ] + + operations = [ + migrations.AlterModelOptions( + name='historicalproctoredexam', + options={'get_latest_by': ('history_date', 'history_id'), 'ordering': ('-history_date', '-history_id'), 'verbose_name': 'historical proctored exam', 'verbose_name_plural': 'historical proctored exams'}, + ), + migrations.AlterModelOptions( + name='historicalproctoredexamstudentattempt', + 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'}, + ), + ] diff --git a/package.json b/package.json index b8c07035208..96b9834b42c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@edx/edx-proctoring", "//": "Note that the version format is slightly different than that of the Python version when using prereleases.", - "version": "4.16.0", + "version": "4.16.1", "main": "edx_proctoring/static/index.js", "scripts": { "test": "gulp test" diff --git a/requirements/base.txt b/requirements/base.txt index e6624f5deed..512fb8d14fc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -50,6 +50,7 @@ django==3.2.20 # -r requirements/base.in # django-crum # django-model-utils + # django-waffle # djangorestframework # drf-jwt # edx-django-utils @@ -67,11 +68,9 @@ django-model-utils==4.3.1 # via # -r requirements/base.in # edx-when -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.in -django-waffle==3.0.0 +django-simple-history==3.3.0 + # via -r requirements/base.in +django-waffle==4.0.0 # via # -r requirements/base.in # edx-django-utils diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt index d34ab34dfd5..18ff1b20a0c 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/dev.txt b/requirements/dev.txt index 962eec5d798..704edc16890 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -97,7 +97,7 @@ pygments==2.15.1 # via # diff-cover # rich -pylint==2.17.4 +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -143,7 +143,7 @@ tomli==2.0.1 # via # pylint # tox -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint tox==3.28.0 # via diff --git a/requirements/quality.txt b/requirements/quality.txt index 178b173503c..7f6a8e43841 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -59,7 +59,7 @@ pydocstyle==6.3.0 # via -r requirements/quality.in pygments==2.15.1 # via rich -pylint==2.17.4 +pylint==2.17.5 # via # edx-lint # pylint-celery @@ -99,7 +99,7 @@ text-unidecode==1.3 # via python-slugify tomli==2.0.1 # via pylint -tomlkit==0.11.8 +tomlkit==0.12.1 # via pylint typer[all]==0.7.0 # via rstcheck diff --git a/requirements/test.txt b/requirements/test.txt index d029cfe3d04..d766dd5bcf3 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -52,6 +52,7 @@ ddt==1.6.0 # -r requirements/base.in # django-crum # django-model-utils + # django-waffle # djangorestframework # drf-jwt # edx-django-utils @@ -70,11 +71,9 @@ django-model-utils==4.3.1 # via # -r requirements/base.in # edx-when -django-simple-history==3.0.0 - # via - # -c requirements/common_constraints.txt - # -r requirements/base.in -django-waffle==3.0.0 +django-simple-history==3.3.0 + # via -r requirements/base.in +django-waffle==4.0.0 # via # -r requirements/base.in # edx-django-utils @@ -220,7 +219,7 @@ requests==2.31.0 # httmock # responses # slumber -responses==0.23.1 +responses==0.23.2 # via -r requirements/test.in rules==3.3 # via -r requirements/base.in From c3dd76a20da10e8fa03f296a6c7a3621bb12f35b Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Sun, 30 Jul 2023 01:27:46 +0500 Subject: [PATCH 2/2] chore: fixing migrations. --- requirements/base.txt | 8 +++++--- requirements/ci.txt | 2 +- requirements/constraints.txt | 3 +++ requirements/dev.txt | 4 ++-- requirements/quality.txt | 4 ++-- requirements/test.txt | 8 +++++--- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 512fb8d14fc..d267697eb74 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -68,8 +68,10 @@ django-model-utils==4.3.1 # via # -r requirements/base.in # edx-when -django-simple-history==3.3.0 - # via -r requirements/base.in +django-simple-history==3.1.1 + # via + # -c requirements/constraints.txt + # -r requirements/base.in django-waffle==4.0.0 # via # -r requirements/base.in @@ -119,7 +121,7 @@ lxml==4.9.3 # via xblock markupsafe==2.1.3 # via xblock -newrelic==8.8.1 +newrelic==8.9.0 # via edx-django-utils pbr==5.11.1 # via stevedore diff --git a/requirements/ci.txt b/requirements/ci.txt index 259679a4c54..d4a8f05fe31 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -14,7 +14,7 @@ filelock==3.12.2 # virtualenv packaging==23.1 # via tox -platformdirs==3.9.1 +platformdirs==3.10.0 # via virtualenv pluggy==1.2.0 # via tox diff --git a/requirements/constraints.txt b/requirements/constraints.txt index a577ad2dacd..943bac1dac6 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -20,3 +20,6 @@ click>=8.0,<9.0 # pinning because to match pin in edx-platform: https://github.com/openedx/edx-platform/blob/e25f00f35cb2ed70502bb0b28909535d55e5525e/requirements/constraints.txt#L83 django-webpack-loader<1.0.0 + +# incremental upgrade plan. +django-simple-history<=3.1.1 \ No newline at end of file diff --git a/requirements/dev.txt b/requirements/dev.txt index 704edc16890..f4e42ee0aa9 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -75,7 +75,7 @@ path-py==12.5.0 # via -r requirements/dev.in pbr==5.11.1 # via stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via # pylint # virtualenv @@ -87,7 +87,7 @@ polib==1.2.0 # via edx-i18n-tools py==1.11.0 # via tox -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.in pydantic==1.10.12 # via rstcheck-core diff --git a/requirements/quality.txt b/requirements/quality.txt index 7f6a8e43841..2324a32712b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -49,9 +49,9 @@ mccabe==0.7.0 # via pylint pbr==5.11.1 # via stevedore -platformdirs==3.9.1 +platformdirs==3.10.0 # via pylint -pycodestyle==2.10.0 +pycodestyle==2.11.0 # via -r requirements/quality.in pydantic==1.10.12 # via rstcheck-core diff --git a/requirements/test.txt b/requirements/test.txt index d766dd5bcf3..83be567d422 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -71,8 +71,10 @@ django-model-utils==4.3.1 # via # -r requirements/base.in # edx-when -django-simple-history==3.3.0 - # via -r requirements/base.in +django-simple-history==3.1.1 + # via + # -c requirements/constraints.txt + # -r requirements/base.in django-waffle==4.0.0 # via # -r requirements/base.in @@ -148,7 +150,7 @@ mock==5.1.0 # via -r requirements/test.in mypy-extensions==1.0.0 # via logilab-common -newrelic==8.8.1 +newrelic==8.9.0 # via edx-django-utils packaging==23.1 # via pytest