From 10373e99bcf75b0eb9d2767e050189cf0e4d417d Mon Sep 17 00:00:00 2001 From: Andres Espinel Date: Thu, 7 Nov 2024 23:59:58 -0500 Subject: [PATCH 1/6] chore: removed unnecessary constraints --- requirements/base.txt | 6 +++--- requirements/constraints.txt | 8 +++++--- requirements/test.txt | 22 ++++++++-------------- requirements/tox.txt | 4 ++-- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index a1f2b7a6..5b548c8c 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -136,7 +136,7 @@ edx-django-utils==7.0.0 # edx-when # event-tracking # openedx-events -edx-drf-extensions==10.4.0 +edx-drf-extensions==10.5.0 # via # -r requirements/base.in # edx-proctoring @@ -149,7 +149,7 @@ edx-opaque-keys[django]==2.11.0 # edx-proctoring # edx-when # openedx-events -edx-proctoring==4.18.2 +edx-proctoring==4.18.3 # via -r requirements/base.in edx-rest-api-client==6.0.0 # via edx-proctoring @@ -302,7 +302,7 @@ wcwidth==0.2.13 # via prompt-toolkit web-fragments==2.2.0 # via xblock -webob==1.8.8 +webob==1.8.9 # via xblock xblock==5.1.0 # via edx-when diff --git a/requirements/constraints.txt b/requirements/constraints.txt index e451b81a..acbeb5db 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -11,9 +11,11 @@ # Common constraints for Open edX repos -c https://raw.githubusercontent.com/openedx/edx-lint/master/edx_lint/files/common_constraints.txt -# Keep same platform version -pylint<3.0 -pycodestyle<2.9.0 +# Versions >= 3.3.0 drop support for Python 3.8 +# Ensures a consistent pylint version across all Python environments to avoid triggering varying warnings +pylint<3.3.0 + +# Higher version has breaking changes in the platform django-oauth-toolkit<2.0.0 # backports.zoneinfo is only needed for Python < 3.9 diff --git a/requirements/test.txt b/requirements/test.txt index fec1add1..73323d3f 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -17,7 +17,7 @@ asgiref==3.8.1 # -r requirements/base.txt # django # django-countries -astroid==2.15.8 +astroid==3.2.4 # via pylint attrs==24.2.0 # via @@ -186,7 +186,7 @@ edx-django-utils==7.0.0 # edx-when # event-tracking # openedx-events -edx-drf-extensions==10.4.0 +edx-drf-extensions==10.5.0 # via # -r requirements/base.txt # edx-proctoring @@ -199,7 +199,7 @@ edx-opaque-keys[django]==2.11.0 # edx-proctoring # edx-when # openedx-events -edx-proctoring==4.18.2 +edx-proctoring==4.18.3 # via -r requirements/base.txt edx-rest-api-client==6.0.0 # via @@ -222,7 +222,7 @@ exceptiongroup==1.2.2 # via pytest factory-boy==3.3.1 # via -r requirements/test.in -faker==30.8.0 +faker==30.8.2 # via factory-boy fastavro==1.9.7 # via @@ -260,8 +260,6 @@ kombu==5.4.2 # via # -r requirements/base.txt # celery -lazy-object-proxy==1.10.0 - # via astroid lxml==5.3.0 # via # -r requirements/base.txt @@ -315,10 +313,8 @@ psutil==6.1.0 # via # -r requirements/base.txt # edx-django-utils -pycodestyle==2.8.0 - # via - # -c requirements/constraints.txt - # -r requirements/test.in +pycodestyle==2.12.1 + # via -r requirements/test.in pycparser==2.22 # via # -r requirements/base.txt @@ -335,7 +331,7 @@ pyjwt[crypto]==2.9.0 # edx-proctoring # edx-rest-api-client # social-auth-core -pylint==2.17.7 +pylint==3.2.7 # via # -c requirements/constraints.txt # -r requirements/test.in @@ -484,12 +480,10 @@ web-fragments==2.2.0 # via # -r requirements/base.txt # xblock -webob==1.8.8 +webob==1.8.9 # via # -r requirements/base.txt # xblock -wrapt==1.16.0 - # via astroid xblock==5.1.0 # via # -r requirements/base.txt diff --git a/requirements/tox.txt b/requirements/tox.txt index 627440c7..895a4c14 100644 --- a/requirements/tox.txt +++ b/requirements/tox.txt @@ -32,9 +32,9 @@ tomli==2.0.2 # via # pyproject-api # tox -tox==4.23.1 +tox==4.23.2 # via -r requirements/tox.in typing-extensions==4.12.2 # via tox -virtualenv==20.27.0 +virtualenv==20.27.1 # via tox From 404c319e376f13b2def377f9cabfa4a7996c9800 Mon Sep 17 00:00:00 2001 From: Andres Espinel Date: Tue, 12 Nov 2024 14:40:50 -0500 Subject: [PATCH 2/6] chore: initiate empty variable to avoid warning --- eox_core/api/v1/serializers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eox_core/api/v1/serializers.py b/eox_core/api/v1/serializers.py index ab1aaa6f..00b57109 100644 --- a/eox_core/api/v1/serializers.py +++ b/eox_core/api/v1/serializers.py @@ -216,6 +216,10 @@ def update(self, instance, validated_data): has_profile = hasattr(instance, 'profile') extra_registration_fields.update(extended_profile_fields) + + # Initialize profile_meta to avoid potential unassigned variable warning + profile_meta = {} + if has_profile: profile_meta = instance.profile.get_meta() From 766c0cc79d35f1e05d17ea53687272eeaa88815a Mon Sep 17 00:00:00 2001 From: Andres Espinel Date: Tue, 12 Nov 2024 14:45:14 -0500 Subject: [PATCH 3/6] chore: removed blank line --- eox_core/api/v1/serializers.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eox_core/api/v1/serializers.py b/eox_core/api/v1/serializers.py index 00b57109..acfd8003 100644 --- a/eox_core/api/v1/serializers.py +++ b/eox_core/api/v1/serializers.py @@ -44,6 +44,7 @@ class EdxappWithWarningSerializer(serializers.Serializer): """ Mixin serializer to add a warning field to Edxapp serializers """ + def __init__(self, *args, **kwargs): """ Conditionally adds a warning field if a context is passed @@ -219,7 +220,7 @@ def update(self, instance, validated_data): # Initialize profile_meta to avoid potential unassigned variable warning profile_meta = {} - + if has_profile: profile_meta = instance.profile.get_meta() @@ -295,6 +296,7 @@ class EdxappValidatedCourseIDField(serializers.Field): """ CourseKey Field """ + def to_representation(self, value): return str(value) From 855b4fbb87938c3ad4f1372c4f11603bb985b449 Mon Sep 17 00:00:00 2001 From: Andres Espinel Date: Tue, 12 Nov 2024 15:14:54 -0500 Subject: [PATCH 4/6] chore: added more description on django-oauth comment --- requirements/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index acbeb5db..e72db78e 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,7 +15,7 @@ # Ensures a consistent pylint version across all Python environments to avoid triggering varying warnings pylint<3.3.0 -# Higher version has breaking changes in the platform +# Higher version has breaking changes in the platform as described here https://github.com/openedx/edx-platform/issues/35277 django-oauth-toolkit<2.0.0 # backports.zoneinfo is only needed for Python < 3.9 From 55bf98bbb42bfa50b711241232eb203ea35bc106 Mon Sep 17 00:00:00 2001 From: Andres Espinel Date: Mon, 18 Nov 2024 01:01:48 -0500 Subject: [PATCH 5/6] chore: updated constraint commentary with correct issue --- requirements/constraints.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index e72db78e..51f76a64 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,7 +15,10 @@ # Ensures a consistent pylint version across all Python environments to avoid triggering varying warnings pylint<3.3.0 -# Higher version has breaking changes in the platform as described here https://github.com/openedx/edx-platform/issues/35277 +# Date: 2023-07-31 +# As it is not clarified what exact breaking changes will be introduced as per +# the next major release, ensure the installed version is within boundaries. +# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32884 django-oauth-toolkit<2.0.0 # backports.zoneinfo is only needed for Python < 3.9 From 96ae06eb1b69d3bf0caaf68aaa4e0b26704e8f05 Mon Sep 17 00:00:00 2001 From: Andres Espinel Date: Thu, 21 Nov 2024 01:29:41 -0500 Subject: [PATCH 6/6] chore: removed date from comment --- requirements/constraints.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 51f76a64..77129ff6 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -15,7 +15,6 @@ # Ensures a consistent pylint version across all Python environments to avoid triggering varying warnings pylint<3.3.0 -# Date: 2023-07-31 # As it is not clarified what exact breaking changes will be introduced as per # the next major release, ensure the installed version is within boundaries. # Issue for unpinning: https://github.com/openedx/edx-platform/issues/32884