diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5839322..b3dd90e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: TUTOR_PLUGIN: minio TUTOR_PYPI_PACKAGE: tutor-minio - OPENEDX_RELEASE: palm + OPENEDX_RELEASE: quince GITHUB_REPO: overhangio/tutor-minio include: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e39f53..f3103ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,12 @@ instructions, because git commits are used to generate release notes: + +## v17.0.0 (2023-12-09) + +- 💥[Feature] Upgrade to Quince. (by @Fahadkhalid210) +- [Bugfix] Make LMS/Studio connnect to the right port in dev mode. (by @ormsbee) + ## v16.0.2 (2023-12-08) diff --git a/README.rst b/README.rst index 29a3a9e..9ce2e5d 100644 --- a/README.rst +++ b/README.rst @@ -39,7 +39,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.overhang.io. In development mode, the MinIO interface will be available at http://minio.local.overhang.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.edly.io. In development mode, the MinIO interface will be available at http://minio.local.edly.io:9001. Web UI ------ diff --git a/setup.py b/setup.py index 165f231..99f3f68 100644 --- a/setup.py +++ b/setup.py @@ -33,8 +33,8 @@ packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.8", - install_requires=["tutor>=16.0.0,<17.0.0"], - extras_require={"dev": "tutor[dev]>=16.0.0,<17.0.0"}, + install_requires=["tutor>=17.0.0,<18.0.0"], + extras_require={"dev": "tutor[dev]>=17.0.0,<18.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 eabf3d3..a08b09c 100644 --- a/tutorminio/__about__.py +++ b/tutorminio/__about__.py @@ -1 +1 @@ -__version__ = "16.0.2" +__version__ = "17.0.0" diff --git a/tutorminio/patches/openedx-common-settings b/tutorminio/patches/openedx-common-settings index 5b30769..b7fb118 100644 --- a/tutorminio/patches/openedx-common-settings +++ b/tutorminio/patches/openedx-common-settings @@ -12,14 +12,3 @@ AWS_S3_ENDPOINT_URL = "{{ "https" if ENABLE_HTTPS else "http" }}://{{ MINIO_HOST AWS_AUTO_CREATE_BUCKET = False # explicit is better than implicit AWS_DEFAULT_ACL = None AWS_QUERYSTRING_EXPIRE = 7 * 24 * 60 * 60 # 1 week: this is necessary to generate valid download urls - -# User tasks assets storage -# In theory we could use cms.djangoapps.contentstore.storage.ImportExportS3Storage, -# but this class makes use of boto, which does not support sig3v4 auth. -from storages.backends.s3boto3 import S3Boto3Storage -class MinIOStorage(S3Boto3Storage): # pylint: disable=abstract-method - def __init__(self): - bucket = "{{ MINIO_BUCKET_NAME }}" - super().__init__(bucket=bucket, custom_domain=None, querystring_auth=True) - -USER_TASKS_ARTIFACT_STORAGE = f"{__name__}.MinIOStorage" diff --git a/tutorminio/patches/openedx-lms-common-settings b/tutorminio/patches/openedx-lms-common-settings deleted file mode 100644 index 1b1db82..0000000 --- a/tutorminio/patches/openedx-lms-common-settings +++ /dev/null @@ -1,9 +0,0 @@ -# LMS-specific media storage -PROFILE_IMAGE_BACKEND = { - "class": DEFAULT_FILE_STORAGE, - "options": { - "location": PROFILE_IMAGE_BACKEND["options"]["location"].lstrip("/"), - # the following non empty property is necessary in development - "base_url": "dummyprofileimagebaseurl", - }, -}