diff --git a/CHANGELOG.md b/CHANGELOG.md index 796dc4a..b5555f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,24 @@ instructions, because git commits are used to generate release notes: + +## v20.0.0 (2025-06-05) + +- [Bugfix] Add support to consume events from event bus in discovery. Explanation can be viewed here: https://github.com/openedx/event-bus-redis/blob/main/docs/tutor_installation.rst. (by @Faraz32123) + +- [Feature] Introduced a new environment variable to enable or disable programs. (by @Faraz32123) + - This aligns with the frontend, which now also utilizes this environment variable. To view the frontend related changes, click here: https://github.com/openedx/frontend-app-learner-dashboard/pull/506/files. + - Additionally, it automates the enabling of programs in the "programapiconfig" model on the LMS admin panel through init tasks. + +- [Improvement] Migrate packaging from setup.py/setuptools to pyproject.toml/hatch. (by @Faraz32123) + - For more details view tutor core PR: https://github.com/overhangio/tutor/pull/1163 + +- [Improvement] Add hatch_build.py in sdist target to fix the installation issues (by @dawoudsheraz) + +- [Improvement] Replace site-configuration script with create_or_update_site_configuration management command in the init task. (by @Danyal-Faheem) + +- 💥[Feature] Upgrade to Teak. (by @mlabeeb03) + ## v19.0.0 (2024-10-23) diff --git a/changelog.d/20250108_184343_faraz.maqsood_add_support_for_consuming_events_from_event_bus.md b/changelog.d/20250108_184343_faraz.maqsood_add_support_for_consuming_events_from_event_bus.md deleted file mode 100644 index 871d2b6..0000000 --- a/changelog.d/20250108_184343_faraz.maqsood_add_support_for_consuming_events_from_event_bus.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Add support to consume events from event bus in discovery. Explanation can be viewed here: https://github.com/openedx/event-bus-redis/blob/main/docs/tutor_installation.rst. (by @Faraz32123) diff --git a/changelog.d/20250121_170746_faraz.maqsood_faraz_add_setting_variable_for_programs.md b/changelog.d/20250121_170746_faraz.maqsood_faraz_add_setting_variable_for_programs.md deleted file mode 100644 index fea5981..0000000 --- a/changelog.d/20250121_170746_faraz.maqsood_faraz_add_setting_variable_for_programs.md +++ /dev/null @@ -1,3 +0,0 @@ -- [Feature] Introduced a new environment variable to enable or disable programs. (by @Faraz32123) - - This aligns with the frontend, which now also utilizes this environment variable. To view the frontend related changes, click here: https://github.com/openedx/frontend-app-learner-dashboard/pull/506/files. - - Additionally, it automates the enabling of programs in the "programapiconfig" model on the LMS admin panel through init tasks. diff --git a/changelog.d/20250124_200748_faraz.maqsood_faraz_migrate_from_setup_py_and_setuptools_to_pyproject_toml_and_hatch.md b/changelog.d/20250124_200748_faraz.maqsood_faraz_migrate_from_setup_py_and_setuptools_to_pyproject_toml_and_hatch.md deleted file mode 100644 index 9dddc5e..0000000 --- a/changelog.d/20250124_200748_faraz.maqsood_faraz_migrate_from_setup_py_and_setuptools_to_pyproject_toml_and_hatch.md +++ /dev/null @@ -1,2 +0,0 @@ -- [Improvement] Migrate packaging from setup.py/setuptools to pyproject.toml/hatch. (by @Faraz32123) - - For more details view tutor core PR: https://github.com/overhangio/tutor/pull/1163 diff --git a/changelog.d/20250312_113751_dawoud.sheraz_fix_hatch_build.md b/changelog.d/20250312_113751_dawoud.sheraz_fix_hatch_build.md deleted file mode 100644 index fb4c929..0000000 --- a/changelog.d/20250312_113751_dawoud.sheraz_fix_hatch_build.md +++ /dev/null @@ -1 +0,0 @@ -- [Improvement] Add hatch_build.py in sdist target to fix the installation issues (by @dawoudsheraz) diff --git a/pyproject.toml b/pyproject.toml index abcb4ad..fb61078 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,14 +27,14 @@ classifiers = [ "Programming Language :: Python :: 3.12", ] dependencies = [ - "tutor>=19.0.0,<20.0.0", + "tutor>=20.0.0,<21.0.0", ] # these fields will be set by hatch_build.py dynamic = ["version"] [project.optional-dependencies] dev = [ - "tutor[dev]>=19.0.0,<20.0.0", + "tutor[dev]>=20.0.0,<21.0.0", "pylint", "black" ] diff --git a/tutordiscovery/__about__.py b/tutordiscovery/__about__.py index 0122a6f..9c9eb91 100644 --- a/tutordiscovery/__about__.py +++ b/tutordiscovery/__about__.py @@ -1 +1 @@ -__version__ = "19.0.0" +__version__ = "20.0.0" diff --git a/tutordiscovery/templates/discovery/build/discovery/Dockerfile b/tutordiscovery/templates/discovery/build/discovery/Dockerfile index 6b1bdcf..20a0a40 100644 --- a/tutordiscovery/templates/discovery/build/discovery/Dockerfile +++ b/tutordiscovery/templates/discovery/build/discovery/Dockerfile @@ -47,7 +47,7 @@ RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install \ # https://pypi.org/project/setuptools/ # https://pypi.org/project/pip/ # https://pypi.org/project/wheel/ - setuptools==75.2.0 pip==24.2 wheel==0.44.0 + setuptools==77.0.3 pip==25.0.1 wheel==0.45.1 # Install a recent version of nodejs RUN pip install nodeenv==1.9.1 @@ -73,7 +73,7 @@ RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared pip install \ # Use redis as a django cache https://pypi.org/project/django-redis/ django-redis==5.4.0 \ # uwsgi server https://pypi.org/project/uWSGI/ - uwsgi==2.0.27 + uwsgi==2.0.28 {% if DISCOVERY_ATLAS_PULL %} # Pull translations. Support the OEP-58 proposal behind a feature flag until it's fully implemented. diff --git a/tutordiscovery/templates/discovery/tasks/lms/init b/tutordiscovery/templates/discovery/tasks/lms/init index 16db4f9..64039ae 100644 --- a/tutordiscovery/templates/discovery/tasks/lms/init +++ b/tutordiscovery/templates/discovery/tasks/lms/init @@ -62,5 +62,5 @@ # configuration -- which means that it takes different values for different # sites. This is important because the programs and courses returned for each # site will differ. -site-configuration set -d {{ LMS_HOST }} COURSE_CATALOG_API_URL {% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ DISCOVERY_HOST }}/api/v1 -site-configuration set -d {{ LMS_HOST }}:8000 COURSE_CATALOG_API_URL http://{{ DISCOVERY_HOST }}:8381/api/v1 +./manage.py lms create_or_update_site_configuration {{ LMS_HOST }} --configuration '{"COURSE_CATALOG_API_URL": "{% if ENABLE_HTTPS %}https{% else %}http{% endif %}://{{ DISCOVERY_HOST }}/api/v1"}' --enabled +./manage.py lms create_or_update_site_configuration {{ LMS_HOST }}:8000 --configuration '{"COURSE_CATALOG_API_URL": "http://{{ DISCOVERY_HOST }}:8381/api/v1"}' --enabled