Skip to content

Commit

Permalink
upgrade to redwood
Browse files Browse the repository at this point in the history
  • Loading branch information
FahadKhalid210 authored and regisb committed Jun 19, 2024
1 parent d816204 commit 818dd6e
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 10 deletions.
1 change: 1 addition & 0 deletions changelog.d/20240606_164812_fahad.khalid_redwood.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- 💥[Feature] Upgrade to redwood (by @Fahadkhalid210)
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ def load_about():
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",
Expand Down
2 changes: 1 addition & 1 deletion tutorcairn/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "17.1.0"
__version__ = "18.0.0"
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"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 #}
Expand Down
10 changes: 5 additions & 5 deletions tutorcairn/templates/cairn/build/cairn-superset/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ def check_permission(permission_view) -> bool:
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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
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
Expand Down

0 comments on commit 818dd6e

Please sign in to comment.