From 5c99bb477f88f9ac8073e1934b1c30d392db3106 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 | 4 ++-- tutorcairn/templates/cairn/build/cairn-superset/cairn/sso.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 6229ea2..32688d2 100644 --- a/README.rst +++ b/README.rst @@ -61,7 +61,7 @@ Then, restart your platform and run the initialization scripts:: tutor local launch -Open http(s)://data. in your browser. When running locally, this will be http://data.local.edly.io. (http://data.local.edly.io:2247 in development). Users authenticate with their LMS user. By default, they have access to the data generated by the courses in which they have the "staff role". Once a user has successfully logged-in, their account can be modified with the ``cairn-createuser`` command. +Open http(s)://data. in your browser. When running locally, this will be http://data.local.openedx.io. (http://data.local.openedx.io:2247 in development). Users authenticate with their LMS user. By default, they have access to the data generated by the courses in which they have the "staff role". Once a user has successfully logged-in, their account can be modified with the ``cairn-createuser`` command. For instance, to convert an existing user to administrator status, run:: @@ -187,7 +187,7 @@ In this example, the following folder should be created in the plugin:: ``tutorc Development ----------- -In development, the Superset user interface will be available at http://data.local.edly.io:2247. +In development, the Superset user interface will be available at http://data.local.openedx.io:2247. To reload Vector configuration after changes to vector.toml, run:: diff --git a/tutorcairn/templates/cairn/build/cairn-superset/cairn/sso.py b/tutorcairn/templates/cairn/build/cairn-superset/cairn/sso.py index 8fcfa7d..9d04b71 100644 --- a/tutorcairn/templates/cairn/build/cairn-superset/cairn/sso.py +++ b/tutorcairn/templates/cairn/build/cairn-superset/cairn/sso.py @@ -29,7 +29,7 @@ def oauth_user_info(self, provider, response=None): def get_user_info(self): """ Make calls to the LMS API to fetch user information - http://local.edly.io:8000/api-docs/#/user/user_v1_me_read + http://local.openedx.io:8000/api-docs/#/user/user_v1_me_read """ username = self.get_lms_api("/api/user/v1/me")["username"] account = self.get_lms_api(f"/api/user/v1/accounts/{username}") From be91f0741d1ebf99833bff89da6fccf5abab890f Mon Sep 17 00:00:00 2001 From: Danyal-Faheem Date: Tue, 22 Oct 2024 19:26:06 +0500 Subject: [PATCH 2/4] feat: upgrade clickhouse base image --- ...241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md | 1 + tutorcairn/templates/cairn/build/cairn-clickhouse/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/20241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md diff --git a/changelog.d/20241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md b/changelog.d/20241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md new file mode 100644 index 0000000..89ca0d6 --- /dev/null +++ b/changelog.d/20241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md @@ -0,0 +1 @@ +- [Feature] Upgrade Clickhouse base image to 24.2.3.70. (by @Danyal-Faheem) diff --git a/tutorcairn/templates/cairn/build/cairn-clickhouse/Dockerfile b/tutorcairn/templates/cairn/build/cairn-clickhouse/Dockerfile index d9259ec..3c90065 100644 --- a/tutorcairn/templates/cairn/build/cairn-clickhouse/Dockerfile +++ b/tutorcairn/templates/cairn/build/cairn-clickhouse/Dockerfile @@ -1,5 +1,5 @@ # https://hub.docker.com/r/clickhouse/clickhouse-server/tags -FROM docker.io/clickhouse/clickhouse-server:24.1.8.22 +FROM docker.io/clickhouse/clickhouse-server:24.2.3.70 RUN apt update && apt install -y python3 COPY ./scripts /scripts From 2dbd9dc0e79c200b2d1c6edab3ebba803ec88951 Mon Sep 17 00:00:00 2001 From: Danyal-Faheem Date: Tue, 22 Oct 2024 19:28:44 +0500 Subject: [PATCH 3/4] v19.0.0 --- CHANGELOG.md | 13 +++++++++++++ changelog.d/20240416_165758_fahad.khalid.md | 1 - changelog.d/20240621_170044_regis.md | 1 - ...l.faheem_import_course_data_on_course_publish.md | 1 - ...3_danyal.faheem_upgrade_clickhouse_base_image.md | 1 - setup.py | 4 ++-- tutorcairn/__about__.py | 2 +- 7 files changed, 16 insertions(+), 7 deletions(-) delete mode 100644 changelog.d/20240416_165758_fahad.khalid.md delete mode 100644 changelog.d/20240621_170044_regis.md delete mode 100644 changelog.d/20240805_183125_danyal.faheem_import_course_data_on_course_publish.md delete mode 100644 changelog.d/20241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md diff --git a/CHANGELOG.md b/CHANGELOG.md index e4e4803..31236e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,19 @@ instructions, because git commits are used to generate release notes: + +## v19.0.0 (2024-10-22) + +- [Improvement] Added CORS for embeded Dashboards. (by @Fahadkhalid210) + +- [Bugfix] Fix legacy warnings during Docker build. (by @regisb) + +- [Improvement] Auto import course structure to clickhouse on course publish by parsing CMS logs. (by @Danyal-Faheem) + +- [Feature] Upgrade Clickhouse base image to 24.2.3.70. (by @Danyal-Faheem) + +- 💥[Feature] Upgrade to Sumac. (by @Danyal-Faheem) + ## v18.0.0 (2024-06-20) diff --git a/changelog.d/20240416_165758_fahad.khalid.md b/changelog.d/20240416_165758_fahad.khalid.md deleted file mode 100644 index 26e2291..0000000 --- a/changelog.d/20240416_165758_fahad.khalid.md +++ /dev/null @@ -1 +0,0 @@ -- [Improvement] Added CORS for embeded Dashboards. (by @Fahadkhalid210) \ No newline at end of file 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/20240805_183125_danyal.faheem_import_course_data_on_course_publish.md b/changelog.d/20240805_183125_danyal.faheem_import_course_data_on_course_publish.md deleted file mode 100644 index 9ca1fee..0000000 --- a/changelog.d/20240805_183125_danyal.faheem_import_course_data_on_course_publish.md +++ /dev/null @@ -1 +0,0 @@ -- [Improvement] Auto import course structure to clickhouse on course publish by parsing CMS logs. (by @Danyal-Faheem) \ No newline at end of file diff --git a/changelog.d/20241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md b/changelog.d/20241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md deleted file mode 100644 index 89ca0d6..0000000 --- a/changelog.d/20241022_190123_danyal.faheem_upgrade_clickhouse_base_image.md +++ /dev/null @@ -1 +0,0 @@ -- [Feature] Upgrade Clickhouse base image to 24.2.3.70. (by @Danyal-Faheem) diff --git a/setup.py b/setup.py index aed91dd..ae050a6 100644 --- a/setup.py +++ b/setup.py @@ -43,8 +43,8 @@ def load_about(): 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": ["cairn = tutorcairn.plugin"]}, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/tutorcairn/__about__.py b/tutorcairn/__about__.py index c6a8b8e..0122a6f 100644 --- a/tutorcairn/__about__.py +++ b/tutorcairn/__about__.py @@ -1 +1 @@ -__version__ = "18.0.0" +__version__ = "19.0.0" From 32dc0885cc969ad3236f08b74d53d5fa75a00b67 Mon Sep 17 00:00:00 2001 From: Syed Muhammad Dawoud Sheraz Ali Date: Mon, 9 Dec 2024 19:11:41 +0500 Subject: [PATCH 4/4] chore: update changelog --- CHANGELOG.md | 6 ++++++ .../20241107_185222_danyal.faheem_remove_py3_8_reference.md | 1 - changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 changelog.d/20241107_185222_danyal.faheem_remove_py3_8_reference.md delete mode 100644 changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 31236e5..46aba09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,12 @@ instructions, because git commits are used to generate release notes: - [Feature] Upgrade Clickhouse base image to 24.2.3.70. (by @Danyal-Faheem) +- [Deprecation] Drop support for python 3.8 as it has reached end of life. (by @Danyal-Faheem) + +- 💥[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 @Danyal-Faheem) diff --git a/changelog.d/20241107_185222_danyal.faheem_remove_py3_8_reference.md b/changelog.d/20241107_185222_danyal.faheem_remove_py3_8_reference.md deleted file mode 100644 index 30cb9ca..0000000 --- a/changelog.d/20241107_185222_danyal.faheem_remove_py3_8_reference.md +++ /dev/null @@ -1 +0,0 @@ -- [Deprecation] Drop support for python 3.8 as it has reached end of life. (by @Danyal-Faheem) \ No newline at end of file diff --git a/changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md b/changelog.d/20241119_180254_dawoud.sheraz_branch_rename.md deleted file mode 100644 index 0385bc2..0000000 --- a/changelog.d/20241119_180254_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.