From a71b5ba47eac13c8347e65c4d50023894d00a583 Mon Sep 17 00:00:00 2001 From: farhan Date: Wed, 3 Apr 2024 12:42:39 +0500 Subject: [PATCH 1/4] chore: Upgrade python requirements --- requirements/base.txt | 2 +- requirements/dev.txt | 18 ++++-------------- requirements/doc.txt | 4 ++-- requirements/quality.txt | 13 +++---------- requirements/test.txt | 4 ++-- 5 files changed, 12 insertions(+), 29 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index f07da4e5b..af94412fc 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -60,7 +60,7 @@ django-waffle==4.1.0 # via # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.in # drf-jwt diff --git a/requirements/dev.txt b/requirements/dev.txt index ecf33654a..ffe6dc22d 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -95,7 +95,6 @@ cryptography==42.0.5 # via # -r requirements/quality.txt # pyjwt - # secretstorage ddt==1.7.2 # via -r requirements/quality.txt diff-cover==8.0.3 @@ -143,7 +142,7 @@ django-waffle==4.1.0 # -r requirements/quality.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/quality.txt # drf-jwt @@ -225,17 +224,12 @@ jaraco-functools==4.0.0 # via # -r requirements/quality.txt # keyring -jeepney==0.8.0 - # via - # -r requirements/quality.txt - # keyring - # secretstorage jinja2==3.1.3 # via # -r requirements/quality.txt # code-annotations # diff-cover -keyring==25.0.0 +keyring==25.1.0 # via # -r requirements/quality.txt # twine @@ -243,7 +237,7 @@ kombu==5.3.6 # via # -r requirements/quality.txt # celery -lxml==5.2.0 +lxml==5.2.1 # via edx-i18n-tools markdown-it-py==3.0.0 # via @@ -430,10 +424,6 @@ rich==13.7.1 # twine rules==3.3 # via -r requirements/quality.txt -secretstorage==3.3.3 - # via - # -r requirements/quality.txt - # keyring semantic-version==2.10.0 # via # -r requirements/quality.txt @@ -498,7 +488,7 @@ types-pyyaml==6.0.12.20240311 # -r requirements/quality.txt # django-stubs # djangorestframework-stubs -types-requests==2.31.0.20240311 +types-requests==2.31.0.20240403 # via # -r requirements/quality.txt # djangorestframework-stubs diff --git a/requirements/doc.txt b/requirements/doc.txt index 87dfae869..e8ca1b478 100644 --- a/requirements/doc.txt +++ b/requirements/doc.txt @@ -118,7 +118,7 @@ django-waffle==4.1.0 # -r requirements/test.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/test.txt # drf-jwt @@ -352,7 +352,7 @@ types-pyyaml==6.0.12.20240311 # -r requirements/test.txt # django-stubs # djangorestframework-stubs -types-requests==2.31.0.20240311 +types-requests==2.31.0.20240403 # via # -r requirements/test.txt # djangorestframework-stubs diff --git a/requirements/quality.txt b/requirements/quality.txt index 57819a190..700681889 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -83,7 +83,6 @@ cryptography==42.0.5 # via # -r requirements/test.txt # pyjwt - # secretstorage ddt==1.7.2 # via -r requirements/test.txt dill==0.3.8 @@ -120,7 +119,7 @@ django-waffle==4.1.0 # -r requirements/test.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/test.txt # drf-jwt @@ -179,15 +178,11 @@ jaraco-context==4.3.0 # via keyring jaraco-functools==4.0.0 # via keyring -jeepney==0.8.0 - # via - # keyring - # secretstorage jinja2==3.1.3 # via # -r requirements/test.txt # code-annotations -keyring==25.0.0 +keyring==25.1.0 # via twine kombu==5.3.6 # via @@ -324,8 +319,6 @@ rich==13.7.1 # via twine rules==3.3 # via -r requirements/test.txt -secretstorage==3.3.3 - # via keyring semantic-version==2.10.0 # via # -r requirements/test.txt @@ -374,7 +367,7 @@ types-pyyaml==6.0.12.20240311 # -r requirements/test.txt # django-stubs # djangorestframework-stubs -types-requests==2.31.0.20240311 +types-requests==2.31.0.20240403 # via # -r requirements/test.txt # djangorestframework-stubs diff --git a/requirements/test.txt b/requirements/test.txt index 2fed154a2..d21008edd 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -104,7 +104,7 @@ django-waffle==4.1.0 # -r requirements/base.txt # edx-django-utils # edx-drf-extensions -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements/base.txt # drf-jwt @@ -248,7 +248,7 @@ types-pyyaml==6.0.12.20240311 # via # django-stubs # djangorestframework-stubs -types-requests==2.31.0.20240311 +types-requests==2.31.0.20240403 # via djangorestframework-stubs typing-extensions==4.10.0 # via From 0fc4faad6ef1e603ee22977e31f61fdbe6dc024b Mon Sep 17 00:00:00 2001 From: farhan Date: Thu, 4 Apr 2024 13:20:36 +0500 Subject: [PATCH 2/4] fix: fix test case related to TagImportTaskState enum --- .../core/tagging/models/import_export.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/openedx_tagging/core/tagging/models/import_export.py b/openedx_tagging/core/tagging/models/import_export.py index 531a4ccaa..e64a7e55d 100644 --- a/openedx_tagging/core/tagging/models/import_export.py +++ b/openedx_tagging/core/tagging/models/import_export.py @@ -3,7 +3,6 @@ """ from datetime import datetime -from enum import Enum from django.db import models from django.utils.translation import gettext as _ @@ -12,15 +11,15 @@ from .base import Taxonomy -class TagImportTaskState(Enum): +class TagImportTaskState(models.TextChoices): """ Enumerates the states that a TagImportTask can be in. """ - LOADING_DATA = "loading_data" - PLANNING = "planning" - EXECUTING = "executing" - SUCCESS = "success" - ERROR = "error" + LOADING_DATA = "loading_data", _("Loading Data") + PLANNING = "planning", _("Planning") + EXECUTING = "executing", _("Executing") + SUCCESS = "success", _("Success") + ERROR = "error", _("Error") class TagImportTask(models.Model): @@ -42,7 +41,7 @@ class TagImportTask(models.Model): status = models.CharField( max_length=20, - choices=[(status, status.value) for status in TagImportTaskState], + choices=TagImportTaskState, help_text=gettext_lazy("Task status"), ) From 6ca042ee96213b1b2a3783cbf4504f7fa0468b87 Mon Sep 17 00:00:00 2001 From: farhan Date: Thu, 4 Apr 2024 16:34:31 +0500 Subject: [PATCH 3/4] fix: fix things --- openedx_tagging/core/tagging/models/import_export.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openedx_tagging/core/tagging/models/import_export.py b/openedx_tagging/core/tagging/models/import_export.py index e64a7e55d..6c3390c03 100644 --- a/openedx_tagging/core/tagging/models/import_export.py +++ b/openedx_tagging/core/tagging/models/import_export.py @@ -15,11 +15,11 @@ class TagImportTaskState(models.TextChoices): """ Enumerates the states that a TagImportTask can be in. """ - LOADING_DATA = "loading_data", _("Loading Data") - PLANNING = "planning", _("Planning") - EXECUTING = "executing", _("Executing") - SUCCESS = "success", _("Success") - ERROR = "error", _("Error") + LOADING_DATA = "loading_data", gettext_lazy("Loading Data") + PLANNING = "planning", gettext_lazy("Planning") + EXECUTING = "executing", gettext_lazy("Executing") + SUCCESS = "success", gettext_lazy("Success") + ERROR = "error", gettext_lazy("Error") class TagImportTask(models.Model): @@ -41,7 +41,7 @@ class TagImportTask(models.Model): status = models.CharField( max_length=20, - choices=TagImportTaskState, + choices=TagImportTaskState.choices, help_text=gettext_lazy("Task status"), ) From 1333cf6421e35b7e621fd5e10fc91c6a6f373634 Mon Sep 17 00:00:00 2001 From: farhan Date: Fri, 5 Apr 2024 11:59:01 +0500 Subject: [PATCH 4/4] chore: Add migration --- .../0017_alter_tagimporttask_status.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 openedx_tagging/core/tagging/migrations/0017_alter_tagimporttask_status.py diff --git a/openedx_tagging/core/tagging/migrations/0017_alter_tagimporttask_status.py b/openedx_tagging/core/tagging/migrations/0017_alter_tagimporttask_status.py new file mode 100644 index 000000000..66b17dcab --- /dev/null +++ b/openedx_tagging/core/tagging/migrations/0017_alter_tagimporttask_status.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.11 on 2024-04-05 06:58 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('oel_tagging', '0016_object_tag_export_id'), + ] + + operations = [ + migrations.AlterField( + model_name='tagimporttask', + name='status', + field=models.CharField(choices=[('loading_data', 'Loading Data'), ('planning', 'Planning'), ('executing', 'Executing'), ('success', 'Success'), ('error', 'Error')], help_text='Task status', max_length=20), + ), + ]