From 787063eb555ec972774d7626741dc946001cd811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Thu, 17 Oct 2024 08:35:13 +0200 Subject: [PATCH 1/4] docs: *.local.edly.io -> *.local.openedx.io The default URL to run a local platform switched from local.edly.io to local.openedx.io. This changes makes it clearer for everyone that Tutor is to run Open edX. See: https://github.com/overhangio/tutor/issues/1120 --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index ad4deaa..0f087ad 100644 --- a/README.rst +++ b/README.rst @@ -40,7 +40,7 @@ Note to Azure users: you will have to manually grant public access rights to the DNS records ----------- -It is assumed that the ``MINIO_HOST`` DNS record points to your server. When running MinIO on your laptop, the MinIO Web UI will be available at http://minio.local.edly.io. In development mode, the MinIO interface will be available at http://minio.local.edly.io:9001. +It is assumed that the ``MINIO_HOST`` DNS record points to your server. When running MinIO on your laptop, the MinIO Web UI will be available at http://minio.local.openedx.io. In development mode, the MinIO interface will be available at http://minio.local.openedx.io:9001. Web UI ------ From b761ad3c96e8342c5bcd75d74d1e9f39b486ff2e Mon Sep 17 00:00:00 2001 From: Muhammad Faraz Maqsood Date: Thu, 31 Oct 2024 20:15:27 +0500 Subject: [PATCH 2/4] v19.0.0 upgrade to sumac --- CHANGELOG.md | 5 +++++ setup.py | 4 ++-- tutorminio/__about__.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b7ec0a..9112a86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,11 @@ instructions, because git commits are used to generate release notes: + +## v19.0.0 (2024-10-31) + +- 💥[Feature] Upgrade to Sumac. (by @Faraz32123) + ## v18.0.1 (2024-10-31) diff --git a/setup.py b/setup.py index 966b195..5381166 100644 --- a/setup.py +++ b/setup.py @@ -34,8 +34,8 @@ packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.9", - 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"}, entry_points={"tutor.plugin.v1": ["minio = tutorminio.plugin"]}, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/tutorminio/__about__.py b/tutorminio/__about__.py index 28cc149..0122a6f 100644 --- a/tutorminio/__about__.py +++ b/tutorminio/__about__.py @@ -1 +1 @@ -__version__ = "18.0.1" +__version__ = "19.0.0" From 6b50d72b91995a6c6a469bf7c57e99dd83e921d8 Mon Sep 17 00:00:00 2001 From: Muhammad Faraz Maqsood Date: Wed, 30 Oct 2024 19:33:55 +0500 Subject: [PATCH 3/4] feat: add new private bucket for openedx-learning - add a new bucket to handle private media for openedx-learning. - add changelog entry. --- ...ate_bucket_to_handle_private_media_for_openedx_learning.md | 1 + tutorminio/patches/openedx-common-settings | 4 ++++ tutorminio/plugin.py | 1 + tutorminio/templates/minio/tasks/minio/init.sh | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 changelog.d/20241010_164910_faraz.maqsood_add_private_bucket_to_handle_private_media_for_openedx_learning.md diff --git a/changelog.d/20241010_164910_faraz.maqsood_add_private_bucket_to_handle_private_media_for_openedx_learning.md b/changelog.d/20241010_164910_faraz.maqsood_add_private_bucket_to_handle_private_media_for_openedx_learning.md new file mode 100644 index 0000000..7fae714 --- /dev/null +++ b/changelog.d/20241010_164910_faraz.maqsood_add_private_bucket_to_handle_private_media_for_openedx_learning.md @@ -0,0 +1 @@ +- [Feature] Add a new bucket to handle private media for openedx-learning. (by @Faraz32123) diff --git a/tutorminio/patches/openedx-common-settings b/tutorminio/patches/openedx-common-settings index be605a5..7bc9c86 100644 --- a/tutorminio/patches/openedx-common-settings +++ b/tutorminio/patches/openedx-common-settings @@ -3,6 +3,10 @@ VIDEO_IMAGE_SETTINGS["STORAGE_KWARGS"]["location"] = VIDEO_IMAGE_SETTINGS["STORA VIDEO_TRANSCRIPTS_SETTINGS["STORAGE_KWARGS"]["location"] = VIDEO_TRANSCRIPTS_SETTINGS["STORAGE_KWARGS"]["location"].lstrip("/") GRADES_DOWNLOAD["STORAGE_KWARGS"] = {"location": GRADES_DOWNLOAD["STORAGE_KWARGS"]["location"].lstrip("/")} GRADES_DOWNLOAD["STORAGE_KWARGS"]["bucket_name"] = "{{ MINIO_GRADES_BUCKET_NAME }}" +OPENEDX_LEARNING["MEDIA"]["BACKEND"] = DEFAULT_FILE_STORAGE +OPENEDX_LEARNING["MEDIA"]["OPTIONS"] = { + 'bucket_name': "{{ MINIO_OPENEDX_LEARNING_BUCKET_NAME }}", +} # Ora2 setting ORA2_FILEUPLOAD_BACKEND = "s3" diff --git a/tutorminio/plugin.py b/tutorminio/plugin.py index 9ac07d3..65c4cc0 100644 --- a/tutorminio/plugin.py +++ b/tutorminio/plugin.py @@ -24,6 +24,7 @@ "VIDEO_UPLOAD_BUCKET_NAME": "openedxvideos", "HOST": "files.{{ LMS_HOST }}", "CONSOLE_HOST": "minio.{{ LMS_HOST }}", + "OPENEDX_LEARNING_BUCKET_NAME": "openedxlearning", "GRADES_BUCKET_NAME": "openedxgrades", "QUERYSTRING_AUTH": True, # https://hub.docker.com/r/minio/minio/tags diff --git a/tutorminio/templates/minio/tasks/minio/init.sh b/tutorminio/templates/minio/tasks/minio/init.sh index 2ccff20..a3946a6 100644 --- a/tutorminio/templates/minio/tasks/minio/init.sh +++ b/tutorminio/templates/minio/tasks/minio/init.sh @@ -1,5 +1,5 @@ mc config host add minio http://minio:9000 {{ OPENEDX_AWS_ACCESS_KEY }} {{ OPENEDX_AWS_SECRET_ACCESS_KEY }} --api s3v4 -mc mb --ignore-existing minio/{{ MINIO_BUCKET_NAME }} minio/{{ MINIO_FILE_UPLOAD_BUCKET_NAME }} minio/{{ MINIO_VIDEO_UPLOAD_BUCKET_NAME }} minio/{{ MINIO_GRADES_BUCKET_NAME }} +mc mb --ignore-existing minio/{{ MINIO_BUCKET_NAME }} minio/{{ MINIO_FILE_UPLOAD_BUCKET_NAME }} minio/{{ MINIO_VIDEO_UPLOAD_BUCKET_NAME }} minio/{{ MINIO_GRADES_BUCKET_NAME }} minio/{{ MINIO_OPENEDX_LEARNING_BUCKET_NAME }} {% if MINIO_GATEWAY != "azure" %} # Make common file upload bucket public (e.g: for forum image upload) From 3cb88c9a62e7725ca5c9b606dd006a808a6c391f Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali Date: Mon, 9 Dec 2024 18:38:00 +0500 Subject: [PATCH 4/4] chore: update changelog --- CHANGELOG.md | 7 +++++++ ..._bucket_to_handle_private_media_for_openedx_learning.md | 1 - ...20241111_172400_faraz.maqsood_remove_py38_references.md | 1 - changelog.d/20241119_170533_dawoud.sheraz_branch_rename.md | 3 --- 4 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 changelog.d/20241010_164910_faraz.maqsood_add_private_bucket_to_handle_private_media_for_openedx_learning.md delete mode 100644 changelog.d/20241111_172400_faraz.maqsood_remove_py38_references.md delete mode 100644 changelog.d/20241119_170533_dawoud.sheraz_branch_rename.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 9112a86..5c69151 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,13 @@ instructions, because git commits are used to generate release notes: ## v19.0.0 (2024-10-31) +- [Feature] Add a new bucket to handle private media for openedx-learning. (by @Faraz32123) + +- 💥 [Deprecation] Drop support for python 3.8 and set Python 3.9 as the minimum supported python version. (by @Faraz32123) + +- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz): + * Rename **master** to **release**, as this branch runs the latest official Open edX release tag. + * Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release. - 💥[Feature] Upgrade to Sumac. (by @Faraz32123) diff --git a/changelog.d/20241010_164910_faraz.maqsood_add_private_bucket_to_handle_private_media_for_openedx_learning.md b/changelog.d/20241010_164910_faraz.maqsood_add_private_bucket_to_handle_private_media_for_openedx_learning.md deleted file mode 100644 index 7fae714..0000000 --- a/changelog.d/20241010_164910_faraz.maqsood_add_private_bucket_to_handle_private_media_for_openedx_learning.md +++ /dev/null @@ -1 +0,0 @@ -- [Feature] Add a new bucket to handle private media for openedx-learning. (by @Faraz32123) diff --git a/changelog.d/20241111_172400_faraz.maqsood_remove_py38_references.md b/changelog.d/20241111_172400_faraz.maqsood_remove_py38_references.md deleted file mode 100644 index 8b70c7b..0000000 --- a/changelog.d/20241111_172400_faraz.maqsood_remove_py38_references.md +++ /dev/null @@ -1 +0,0 @@ -- 💥 [Deprecation] Drop support for python 3.8 and set Python 3.9 as the minimum supported python version. (by @Faraz32123) diff --git a/changelog.d/20241119_170533_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_170533_dawoud.sheraz_branch_rename.md deleted file mode 100644 index 0385bc2..0000000 --- a/changelog.d/20241119_170533_dawoud.sheraz_branch_rename.md +++ /dev/null @@ -1,3 +0,0 @@ -- 💥[Improvement] Rename Tutor's two branches (by @DawoudSheraz): - * Rename **master** to **release**, as this branch runs the latest official Open edX release tag. - * Rename **nightly** to **main**, as this branch runs the Open edX master branches, which are the basis for the next Open edX release.