From b006819021674562b81bf643054b4969632a44b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 May 2024 15:20:01 -0400 Subject: [PATCH 1/3] fix(deps): update dependency mitol-django-openedx to v2023 (#2092) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- poetry.lock | 12 ++++++------ pyproject.toml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4f6efa4b2a..0907c240f2 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2467,17 +2467,17 @@ posthog = ">=3.5.0" [[package]] name = "mitol-django-openedx" -version = "1.3.0" +version = "2023.12.19" description = "MIT Open Learning django app extensions for edx related utilities" optional = false -python-versions = ">=3.7" +python-versions = ">=3.8" files = [ - {file = "mitol-django-openedx-1.3.0.tar.gz", hash = "sha256:2c6180931c3d31a45999e13b273af95f84881ad388495edd4de41f397da324aa"}, - {file = "mitol_django_openedx-1.3.0-py3-none-any.whl", hash = "sha256:bca1e796d38cbcc5f674b470382f6b1e018e18b55be2737f2882b5ffdb47511b"}, + {file = "mitol-django-openedx-2023.12.19.tar.gz", hash = "sha256:d91ad3bfddbb2563eabccc643995ccac9bfc83919cf13c3e91ede7e4c8b2aef5"}, + {file = "mitol_django_openedx-2023.12.19-py3-none-any.whl", hash = "sha256:0e1faf21ed633371f32db8427840479d68450b10603f33e50613dfdfc96fb582"}, ] [package.dependencies] -django = ">=2.2.12,<4.0" +django = ">=3.0" edx-opaque-keys = "2.2.2" setuptools = "*" @@ -4244,4 +4244,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "3.9.18" -content-hash = "caf53b2cab83203b3f452da41de8e8bc9be50ce87e72626dc0011a5e906f0607" +content-hash = "16b2c38af8931fb4582d359fb626ad9dbbf308f0e91e549d486587f286d01cdc" diff --git a/pyproject.toml b/pyproject.toml index ee195da119..a3e66bb726 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,7 @@ mitol-django-google-sheets-deferrals = "2023.6.9" mitol-django-google-sheets-refunds = "2023.6.9" mitol-django-hubspot-api = "2023.5.22" mitol-django-mail = "3.3.0" -mitol-django-openedx = "1.3.0" +mitol-django-openedx = "2023.12.19" mitol-django-payment-gateway = "2023.12.19" newrelic = "^6.4.1.158" posthog = "^3.0.1" From c969aabb52cd5ff7b82e8102410d15c0ab00cc29 Mon Sep 17 00:00:00 2001 From: Collin Preston Date: Thu, 30 May 2024 09:01:49 -0400 Subject: [PATCH 2/3] Repair test based on dates (test_create_featured_items) (#2229) * Repair test based on dates * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- cms/api_test.py | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/cms/api_test.py b/cms/api_test.py index 7b99c9ec5c..57f6588946 100644 --- a/cms/api_test.py +++ b/cms/api_test.py @@ -308,38 +308,26 @@ def test_create_featured_items(): # Course that starts in the future but is open for enrollment enrollable_future_course = CourseFactory.create(page=None, live=True) CoursePageFactory.create(course=enrollable_future_course, live=True) - enrollable_future_courserun = CourseRunFactory.create( + enrollable_future_courserun = CourseRunFactory.create( # noqa: F841 course=enrollable_future_course, live=True, - in_future=True, + start_date=future_date, + enrollment_start=further_past_date, + enrollment_end=further_future_date, + end_date=furthest_future_date, ) - enrollable_future_courserun.enrollment_start = further_past_date - enrollable_future_courserun.start_date = future_date - enrollable_future_courserun.enrollment_end = further_future_date - enrollable_future_courserun.end_date = furthest_future_date - enrollable_future_courserun.save() # Course that is open for enrollment, but starts after the one above enrollable_other_future_course = CourseFactory.create(page=None, live=True) CoursePageFactory.create(course=enrollable_other_future_course, live=True) - enrollable_other_future_courserun = CourseRunFactory.create( + enrollable_other_future_courserun = CourseRunFactory.create( # noqa: F841 course=enrollable_other_future_course, live=True, - in_future=True, + enrollment_start=further_past_date, + start_date=future_date + timedelta(days=2), + enrollment_end=further_future_date + timedelta(days=2), + end_date=furthest_future_date + timedelta(days=2), ) - enrollable_other_future_courserun.enrollment_start = ( - enrollable_future_courserun.enrollment_start - ) - enrollable_other_future_courserun.start_date = ( - enrollable_future_courserun.start_date + timedelta(days=2) - ) - enrollable_other_future_courserun.enrollment_end = ( - enrollable_future_courserun.enrollment_end + timedelta(days=2) - ) - enrollable_other_future_courserun.end_date = ( - enrollable_future_courserun.end_date + timedelta(days=2) - ) - enrollable_other_future_courserun.save() # A self-paced course that is open for enrollment enrollable_self_paced_course = CourseFactory.create(page=None, live=True) @@ -348,6 +336,7 @@ def test_create_featured_items(): course=enrollable_self_paced_course, live=True, in_progress=True, + enrollment_end=further_future_date + timedelta(days=2), ) self_paced_run.is_self_paced = True self_paced_run.save() @@ -358,11 +347,8 @@ def test_create_featured_items(): course=in_progress_course, live=True, in_progress=True, + enrollment_end=further_future_date + timedelta(days=2), ) - in_progress_course.enrollment_start = further_past_date - in_progress_course.start_date = past_date - in_progress_course.enrollment_end = future_date - in_progress_course.end_date = further_future_date unenrollable_course = CourseFactory.create(page=None, live=False) CoursePageFactory.create(course=unenrollable_course, live=False) From fd7afb11b1a300de54f854b7f9adbd72475fa24f Mon Sep 17 00:00:00 2001 From: Doof Date: Thu, 30 May 2024 13:02:20 +0000 Subject: [PATCH 3/3] Release 0.95.1 --- RELEASE.rst | 6 ++++++ main/settings.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/RELEASE.rst b/RELEASE.rst index 2f337ffe58..0f042a8ed6 100644 --- a/RELEASE.rst +++ b/RELEASE.rst @@ -1,6 +1,12 @@ Release Notes ============= +Version 0.95.1 +-------------- + +- Repair test based on dates (test_create_featured_items) (#2229) +- fix(deps): update dependency mitol-django-openedx to v2023 (#2092) + Version 0.95.0 (Released May 29, 2024) -------------- diff --git a/main/settings.py b/main/settings.py index cfd027d1aa..0a54a9ea54 100644 --- a/main/settings.py +++ b/main/settings.py @@ -29,7 +29,7 @@ from main.celery_utils import OffsettingSchedule from main.sentry import init_sentry -VERSION = "0.95.0" +VERSION = "0.95.1" log = logging.getLogger()