From b89af4240630f35a6a76ae0b2bf80f7a5fdd4536 Mon Sep 17 00:00:00 2001 From: Muhammad Faraz Maqsood Date: Fri, 15 Nov 2024 12:48:21 +0500 Subject: [PATCH] v19.0.0 upgrade to sumac --- CHANGELOG.md | 10 ++++++++++ changelog.d/20240621_170044_regis.md | 1 - ...26_115731_faraz.maqsood_images_persistance_issue.md | 1 - ...247_evgen.dyudyunov_fix_service_user_permissions.md | 1 - .../20241018_185457_hina.khadim_upgrade_ubuntu.md | 1 - setup.py | 4 ++-- tutordiscovery/__about__.py | 2 +- .../templates/discovery/build/discovery/Dockerfile | 6 +++--- 8 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 changelog.d/20240621_170044_regis.md delete mode 100644 changelog.d/20240626_115731_faraz.maqsood_images_persistance_issue.md delete mode 100644 changelog.d/20240710_160247_evgen.dyudyunov_fix_service_user_permissions.md delete mode 100644 changelog.d/20241018_185457_hina.khadim_upgrade_ubuntu.md diff --git a/CHANGELOG.md b/CHANGELOG.md index faf3be1..6090f6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,16 @@ instructions, because git commits are used to generate release notes: + +## v19.0.0 (2024-10-23) + +- 💥[Feature] Upgrade to Sumac. (by @Faraz32123) +- 💥[Feature] Update Course Discovery Image to use Ubuntu 22.04 as base OS. (by @hinakhadim) +- [Bugfix] Fix catalog_service_user permissions and 403 while fetching pathways (by @dyudyunov) +- [BugFix] Fix images(media) persistance issue by mounting media directory in volumes through patches. (by @Faraz32123) +- [Bugfix] Fix legacy warnings during Docker build. (by @regisb) + + ## v18.0.0 (2024-05-14) diff --git a/changelog.d/20240621_170044_regis.md b/changelog.d/20240621_170044_regis.md deleted file mode 100644 index d7d2eb7..0000000 --- a/changelog.d/20240621_170044_regis.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Fix legacy warnings during Docker build. (by @regisb) diff --git a/changelog.d/20240626_115731_faraz.maqsood_images_persistance_issue.md b/changelog.d/20240626_115731_faraz.maqsood_images_persistance_issue.md deleted file mode 100644 index 02233c5..0000000 --- a/changelog.d/20240626_115731_faraz.maqsood_images_persistance_issue.md +++ /dev/null @@ -1 +0,0 @@ -- [BugFix] Fix images(media) persistance issue by mounting media directory in volumes through patches. (by @Faraz32123) diff --git a/changelog.d/20240710_160247_evgen.dyudyunov_fix_service_user_permissions.md b/changelog.d/20240710_160247_evgen.dyudyunov_fix_service_user_permissions.md deleted file mode 100644 index 2b5adb9..0000000 --- a/changelog.d/20240710_160247_evgen.dyudyunov_fix_service_user_permissions.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Fix catalog_service_user permissions and 403 while fetching pathways (by @dyudyunov) diff --git a/changelog.d/20241018_185457_hina.khadim_upgrade_ubuntu.md b/changelog.d/20241018_185457_hina.khadim_upgrade_ubuntu.md deleted file mode 100644 index 13eb288..0000000 --- a/changelog.d/20241018_185457_hina.khadim_upgrade_ubuntu.md +++ /dev/null @@ -1 +0,0 @@ -- 💥[Feature] Update Course Discovery Image to use Ubuntu 22.04 as base OS. (by @hinakhadim) diff --git a/setup.py b/setup.py index 7997045..30f574c 100644 --- a/setup.py +++ b/setup.py @@ -34,8 +34,8 @@ long_description_content_type="text/x-rst", packages=find_packages(exclude=["tests*"]), include_package_data=True, - install_requires=["tutor>=18.0.0,<19.0.0"], - extras_require={"dev": "tutor[dev]>=18.0.0,<19.0.0"}, + install_requires=["tutor>=19.0.0,<20.0.0"], + extras_require={"dev": "tutor[dev]>=19.0.0,<20.0.0"}, python_requires=">=3.9", entry_points={"tutor.plugin.v1": ["discovery = tutordiscovery.plugin"]}, classifiers=[ diff --git a/tutordiscovery/__about__.py b/tutordiscovery/__about__.py index c6a8b8e..0122a6f 100644 --- a/tutordiscovery/__about__.py +++ b/tutordiscovery/__about__.py @@ -1 +1 @@ -__version__ = "18.0.0" +__version__ = "19.0.0" diff --git a/tutordiscovery/templates/discovery/build/discovery/Dockerfile b/tutordiscovery/templates/discovery/build/discovery/Dockerfile index cbe21a8..ef9016e 100644 --- a/tutordiscovery/templates/discovery/build/discovery/Dockerfile +++ b/tutordiscovery/templates/discovery/build/discovery/Dockerfile @@ -47,10 +47,10 @@ 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==69.1.1 pip==24.0 wheel==0.43.0 + setuptools==75.2.0 pip==24.2 wheel==0.44.0 # Install a recent version of nodejs -RUN pip install nodeenv==1.8.0 +RUN pip install nodeenv==1.9.1 # nodejs version picked from https://github.com/openedx/course-discovery/blob/master/Dockerfile RUN nodeenv /openedx/nodeenv --node=16.14.2 --prebuilt ENV PATH=/openedx/nodeenv/bin:${PATH} @@ -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.24 + uwsgi==2.0.27 {% if DISCOVERY_ATLAS_PULL %} # Pull translations. Support the OEP-58 proposal behind a feature flag until it's fully implemented.