feat: upgrade to quince

This commit is contained in:
FahadKhalid210 2023-11-21 17:42:59 +05:00 committed by Régis Behmo
parent 9a3aa323f0
commit ce88178a2b
9 changed files with 35 additions and 17 deletions

View File

@ -2,7 +2,7 @@ variables:
TUTOR_PLUGIN: cairn TUTOR_PLUGIN: cairn
TUTOR_IMAGES: cairn-clickhouse cairn-superset TUTOR_IMAGES: cairn-clickhouse cairn-superset
TUTOR_PYPI_PACKAGE: tutor-cairn TUTOR_PYPI_PACKAGE: tutor-cairn
OPENEDX_RELEASE: palm OPENEDX_RELEASE: quince
GITHUB_REPO: overhangio/tutor-cairn GITHUB_REPO: overhangio/tutor-cairn
IMAGES_BUILD_PLATFORM: "linux/amd64" IMAGES_BUILD_PLATFORM: "linux/amd64"

View File

@ -19,6 +19,14 @@ instructions, because git commits are used to generate release notes:
<!-- scriv-insert-here --> <!-- scriv-insert-here -->
<a id='changelog-17.0.0'></a>
## v17.0.0 (2023-12-09)
- 💥[Feature] Upgrade to Quince. (by @Fahadkhalid210)
- 💥[Improvement] Convert the `course_blocks.graded` field from String to Boolean. (by @regisb)
- 💥[Improvement] Superset auto_sync roles updated. (by @FahadKhalid210)
- [Improvement] Added Typing to code, Makefile and test action to the repository and formatted code with Black and isort. (by @CodeWithEmad)
<a id='changelog-16.0.3'></a> <a id='changelog-16.0.3'></a>
## v16.0.3 (2023-09-07) ## v16.0.3 (2023-09-07)

View File

@ -1 +0,0 @@
- 💥[Improvement] Convert the `course_blocks.graded` field from String to Boolean. (by @regisb)

View File

@ -1 +0,0 @@
- 💥[Improvement] Superset auto_sync roles updated. (by @FahadKhalid210)

View File

@ -1 +0,0 @@
- [Improvement] Added Typing to code, Makefile and test action to the repository and formatted code with Black and isort. (by @CodeWithEmad)

View File

@ -40,9 +40,9 @@ setup(
long_description=load_readme(), long_description=load_readme(),
packages=find_packages(exclude=["tests*"]), packages=find_packages(exclude=["tests*"]),
include_package_data=True, include_package_data=True,
python_requires=">=3.7", python_requires=">=3.8",
install_requires=["tutor>=16.0.0,<17.0.0"], install_requires=["tutor>=17.0.0,<18.0.0"],
extras_require={"dev": ["tutor[dev]>=16.0.0,<17.0.0"]}, extras_require={"dev": ["tutor[dev]>=17.0.0,<18.0.0"]},
entry_points={"tutor.plugin.v1": ["cairn = tutorcairn.plugin"]}, entry_points={"tutor.plugin.v1": ["cairn = tutorcairn.plugin"]},
classifiers=[ classifiers=[
"Development Status :: 5 - Production/Stable", "Development Status :: 5 - Production/Stable",

View File

@ -1 +1 @@
__version__ = "16.0.3" __version__ = "17.0.0"

View File

@ -18,21 +18,30 @@ SQLALCHEMY_DATABASE_URI = "postgresql+psycopg2://{{ CAIRN_POSTGRESQL_USERNAME }}
# https://superset.apache.org/docs/installation/configuring-superset/#configuration-behind-a-load-balancer # https://superset.apache.org/docs/installation/configuring-superset/#configuration-behind-a-load-balancer
ENABLE_PROXY_FIX = True ENABLE_PROXY_FIX = True
# Superset 3.0 ships with a default CSP (Content Security Policy) configuration via Talisman(Forces all connects to https)
# https://preset.io/blog/superset-3-0-release-notes/#default-csp-is-now-in-place
{% if not ENABLE_HTTPS %}
TALISMAN_ENABLED = False
{% endif %}
# Languages # Languages
# https://github.com/apache/superset/blob/dc575080d7e43d40b1734bb8f44fdc291cb95b11/superset/config.py#L324 # https://github.com/apache/superset/blob/dc575080d7e43d40b1734bb8f44fdc291cb95b11/superset/config.py#L324
available_languages = { available_languages = {
"de": {"flag": "de", "name": "German"},
"en": {"flag": "us", "name": "English"}, "en": {"flag": "us", "name": "English"},
"es": {"flag": "es", "name": "Spanish"}, "es": {"flag": "es", "name": "Spanish"},
"it": {"flag": "it", "name": "Italian"},
"fr": {"flag": "fr", "name": "French"}, "fr": {"flag": "fr", "name": "French"},
"zh": {"flag": "cn", "name": "Chinese"}, "it": {"flag": "it", "name": "Italian"},
"ja": {"flag": "jp", "name": "Japanese"}, "ja": {"flag": "jp", "name": "Japanese"},
"de": {"flag": "de", "name": "German"}, "ko": {"flag": "kr", "name": "Korean"},
"nl": {"flag": "nl", "name": "Dutch"},
"pt": {"flag": "pt", "name": "Portuguese"}, "pt": {"flag": "pt", "name": "Portuguese"},
"pt_BR": {"flag": "br", "name": "Brazilian Portuguese"}, "pt_BR": {"flag": "br", "name": "Brazilian Portuguese"},
"ru": {"flag": "ru", "name": "Russian"}, "ru": {"flag": "ru", "name": "Russian"},
"ko": {"flag": "kr", "name": "Korean"}, "sk": {"flag": "sk", "name": "Slovak"},
"sl": {"flag": "si", "name": "Slovenian"}, "sl": {"flag": "si", "name": "Slovenian"},
"zh": {"flag": "cn", "name": "Chinese"},
} }
{#- https://github.com/apache/superset/blob/master/docs/docs/contributing/translations.mdx#enabling-language-selection #} {#- https://github.com/apache/superset/blob/master/docs/docs/contributing/translations.mdx#enabling-language-selection #}
enabled_language_codes = ["en"] enabled_language_codes = ["en"]

View File

@ -3,7 +3,7 @@
# https://github.com/apache/superset/releases # https://github.com/apache/superset/releases
# https://github.com/apache/superset/blob/master/Dockerfile # https://github.com/apache/superset/blob/master/Dockerfile
# https://superset.apache.org/docs/databases/installing-database-drivers # https://superset.apache.org/docs/databases/installing-database-drivers
FROM docker.io/apache/superset:2.1.0 FROM docker.io/apache/superset:3.0.1
USER root USER root
@ -13,12 +13,16 @@ USER root
# https://pypi.org/project/clickhouse-sqlalchemy/ # https://pypi.org/project/clickhouse-sqlalchemy/
# https://pypi.org/project/Authlib/ # https://pypi.org/project/Authlib/
# We preserve the clickhouse-sqlalchemy package to keep backward compatibility with existing dashboards # We preserve the clickhouse-sqlalchemy package to keep backward compatibility with existing dashboards
RUN {% if is_buildkit_enabled() %}--mount=type=cache,target=/root/.cache/pip,sharing=shared {% endif %}pip install \ RUN apt-get update \
&& apt-get install -y \
pkg-config
RUN --mount=type=cache,target=/root/.cache/pip,sharing=shared pip install \
clickhouse-driver==0.2.6 \ clickhouse-driver==0.2.6 \
mysqlclient==2.1.1 \ mysqlclient==2.2.0 \
clickhouse-connect==0.5.24 \ clickhouse-connect==0.6.20 \
clickhouse-sqlalchemy==0.2.4 \ clickhouse-sqlalchemy==0.2.4 \
authlib==1.2.0 authlib==1.2.1
USER superset USER superset