Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Sumac #51

Merged
merged 6 commits into from
Dec 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ instructions, because git commits are used to generate release notes:

<!-- scriv-insert-here -->

<a id='changelog-19.0.0'></a>
## 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)

<a id='changelog-18.0.1'></a>
## v18.0.1 (2024-10-31)

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
------
Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions changelog.d/20241119_170533_dawoud.sheraz_branch_rename.md

This file was deleted.

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tutorminio/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "18.0.1"
__version__ = "19.0.0"
4 changes: 4 additions & 0 deletions tutorminio/patches/openedx-common-settings
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions tutorminio/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tutorminio/templates/minio/tasks/minio/init.sh
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
Loading