diff --git a/CHANGELOG.md b/CHANGELOG.md index 8654bc0..e4e4803 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,15 @@ instructions, because git commits are used to generate release notes: + +## v18.0.0 (2024-06-20) + +- 💥[Feature] Upgrade to Redwood. (by @Fahadkhalid210) +- [Bugfix] Make plugin compatible with Python 3.12 by removing dependency on `pkg_resources`. (by @regisb) +- [Improvement] Update User Activity dataset query by extending time span to 120 seconds and selecting all events where course ID is not null to improve average time spent in course. (by @Fahadkhalid210) +- [Improvement] Added CORS for embedded Dashboards. (by @Fahadkhalid210) +- 💥[Feature] Upgrade Clickhouse to version 24.1.8.22 and fix query issues due to deprecation of live views. (by @Fahadkhalid210) + ## v17.1.0 (2024-02-09) diff --git a/changelog.d/20240212_115536_regis_pkg_resources.md b/changelog.d/20240212_115536_regis_pkg_resources.md deleted file mode 100644 index 35b6d20..0000000 --- a/changelog.d/20240212_115536_regis_pkg_resources.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Make plugin compatible with Python 3.12 by removing dependency on `pkg_resources`. (by @regisb) diff --git a/changelog.d/20240405_151230_fahad.khalid.md b/changelog.d/20240405_151230_fahad.khalid.md deleted file mode 100644 index 83f660b..0000000 --- a/changelog.d/20240405_151230_fahad.khalid.md +++ /dev/null @@ -1 +0,0 @@ -- [Improvement] Update User Activity dataset query by extending time span to 120 seconds and selecting all events where course ID is not null to improve average time spent in course. (by @Fahadkhalid210) 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/20240429_155841_fahad.khalid_fahad_clickhouse_30.md b/changelog.d/20240429_155841_fahad.khalid_fahad_clickhouse_30.md deleted file mode 100644 index 40caf76..0000000 --- a/changelog.d/20240429_155841_fahad.khalid_fahad_clickhouse_30.md +++ /dev/null @@ -1 +0,0 @@ -- 💥[Feature] Upgrade Clickhouse version to `24.1.8.22` and fix query issues due to deprecation of Live views. (by @Fahadkhalid210) diff --git a/setup.py b/setup.py index 6e1e20f..ce5caa5 100644 --- a/setup.py +++ b/setup.py @@ -41,8 +41,8 @@ setup( packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.8", - install_requires=["tutor>=17.0.0,<18.0.0"], - extras_require={"dev": ["tutor[dev]>=17.0.0,<18.0.0"]}, + install_requires=["tutor>=18.0.0,<19.0.0"], + extras_require={"dev": ["tutor[dev]>=18.0.0,<19.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 1bef254..c6a8b8e 100644 --- a/tutorcairn/__about__.py +++ b/tutorcairn/__about__.py @@ -1 +1 @@ -__version__ = "17.1.0" +__version__ = "18.0.0" diff --git a/tutorcairn/templates/cairn/apps/superset/superset_config.py b/tutorcairn/templates/cairn/apps/superset/superset_config.py index 1aa11d6..27e4df0 100644 --- a/tutorcairn/templates/cairn/apps/superset/superset_config.py +++ b/tutorcairn/templates/cairn/apps/superset/superset_config.py @@ -41,6 +41,7 @@ available_languages = { "ru": {"flag": "ru", "name": "Russian"}, "sk": {"flag": "sk", "name": "Slovak"}, "sl": {"flag": "si", "name": "Slovenian"}, + "uk": {"flag": "uk", "name": "Ukranian"}, "zh": {"flag": "cn", "name": "Chinese"}, } {#- https://github.com/apache/superset/blob/master/docs/docs/contributing/translations.mdx#enabling-language-selection #} diff --git a/tutorcairn/templates/cairn/build/cairn-superset/Dockerfile b/tutorcairn/templates/cairn/build/cairn-superset/Dockerfile index dc5efaa..9ec0368 100644 --- a/tutorcairn/templates/cairn/build/cairn-superset/Dockerfile +++ b/tutorcairn/templates/cairn/build/cairn-superset/Dockerfile @@ -3,7 +3,7 @@ # https://github.com/apache/superset/releases # https://github.com/apache/superset/blob/master/Dockerfile # https://superset.apache.org/docs/databases/installing-database-drivers -FROM docker.io/apache/superset:3.0.1 +FROM docker.io/apache/superset:4.0.0 USER root @@ -18,11 +18,11 @@ RUN apt-get update \ pkg-config RUN --mount=type=cache,target=/root/.cache/pip,sharing=shared pip install \ - clickhouse-driver==0.2.6 \ - mysqlclient==2.2.0 \ - clickhouse-connect==0.6.20 \ + clickhouse-driver==0.2.7 \ + mysqlclient==2.2.4 \ + clickhouse-connect==0.7.8 \ clickhouse-sqlalchemy==0.2.4 \ - authlib==1.2.1 + authlib==1.3.0 USER superset diff --git a/tutorcairn/templates/cairn/build/cairn-superset/cairn/bootstrap.py b/tutorcairn/templates/cairn/build/cairn-superset/cairn/bootstrap.py index f88fab7..65354c0 100644 --- a/tutorcairn/templates/cairn/build/cairn-superset/cairn/bootstrap.py +++ b/tutorcairn/templates/cairn/build/cairn-superset/cairn/bootstrap.py @@ -88,7 +88,8 @@ def create_superset_db_role(role_name: str, superset_database_name: str) -> None return False # Create or update role with the same name as the user - security_manager.set_role(role_name, check_permission) + pvms = security_manager._get_all_pvms() + security_manager.set_role(role_name, check_permission, pvms) def create_clickhouse_user(clickhouse_username): diff --git a/tutorcairn/templates/cairn/build/cairn-superset/cairn/ctl.py b/tutorcairn/templates/cairn/build/cairn-superset/cairn/ctl.py index ce8bd0b..4f5bf48 100644 --- a/tutorcairn/templates/cairn/build/cairn-superset/cairn/ctl.py +++ b/tutorcairn/templates/cairn/build/cairn-superset/cairn/ctl.py @@ -13,7 +13,7 @@ from superset.connectors.sqla.models import SqlaTable from superset.models.core import Database from superset.models.slice import Slice from superset.extensions import db, security_manager -import superset.dashboards.commands.importers.v0 as importers +import superset.commands.dashboard.importers.v0 as importers from werkzeug.security import generate_password_hash # Our convenient library