Skip to content

Commit 25c1987

Browse files
authored
Merge branch 'apache:master' into master
2 parents 4aaa27c + 7f38405 commit 25c1987

File tree

196 files changed

+4203
-484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+4203
-484
lines changed

LLMS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ superset/
7070
- **New files require ASF license headers** - When creating new code files, include the standard Apache Software Foundation license header
7171
- **LLM instruction files are excluded** - Files like LLMS.md, CLAUDE.md, etc. are in `.rat-excludes` to avoid header token overhead
7272

73+
### Code Comments
74+
- **Avoid time-specific language** - Don't use words like "now", "currently", "today" in code comments as they become outdated
75+
- **Write timeless comments** - Comments should remain accurate regardless of when they're read
76+
7377
## Documentation Requirements
7478

7579
- **docs/**: Update for any user-facing changes

docker-compose-image-tag.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ x-superset-image: &superset-image apachesuperset.docker.scarf.sh/apache/superset
2828
x-superset-volumes:
2929
&superset-volumes # /app/pythonpath_docker will be appended to the PYTHONPATH in the final container
3030
- ./docker:/app/docker
31+
- ./superset-core:/app/superset-core
3132
- superset_home:/app/superset_home
3233

3334
services:

docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ x-superset-volumes: &superset-volumes
2929
# /app/pythonpath_docker will be appended to the PYTHONPATH in the final container
3030
- ./docker:/app/docker
3131
- ./superset:/app/superset
32+
- ./superset-core:/app/superset-core
3233
- ./superset-frontend:/app/superset-frontend
3334
- superset_home:/app/superset_home
3435
- ./tests:/app/tests
36+
- superset_data:/app/data
3537
x-common-build: &common-build
3638
context: .
3739
target: ${SUPERSET_BUILD_TARGET:-dev} # can use `dev` (default) or `lean`
@@ -274,3 +276,5 @@ volumes:
274276
external: false
275277
redis:
276278
external: false
279+
superset_data:
280+
external: false

docker/docker-bootstrap.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,15 @@ set -eo pipefail
2121
# Make python interactive
2222
if [ "$DEV_MODE" == "true" ]; then
2323
if [ "$(whoami)" = "root" ] && command -v uv > /dev/null 2>&1; then
24-
echo "Reinstalling the app in editable mode"
25-
uv pip install -e .
24+
# Always ensure superset-core is available
25+
echo "Installing superset-core in editable mode"
26+
uv pip install --no-deps -e /app/superset-core
27+
28+
# Only reinstall the main app for non-worker processes
29+
if [ "$1" != "worker" ] && [ "$1" != "beat" ]; then
30+
echo "Reinstalling the app in editable mode"
31+
uv pip install -e .
32+
fi
2633
fi
2734
fi
2835
REQUIREMENTS_LOCAL="/app/docker/requirements-local.txt"
@@ -34,7 +41,8 @@ if [ "$CYPRESS_CONFIG" == "true" ]; then
3441
export SUPERSET__SQLALCHEMY_DATABASE_URI=postgresql+psycopg2://superset:superset@db:5432/superset_cypress
3542
PORT=8081
3643
fi
37-
if [[ "$DATABASE_DIALECT" == postgres* ]] && [ "$(whoami)" = "root" ]; then
44+
# Skip postgres requirements installation for workers to avoid conflicts
45+
if [[ "$DATABASE_DIALECT" == postgres* ]] && [ "$(whoami)" = "root" ] && [ "$1" != "worker" ] && [ "$1" != "beat" ]; then
3846
# older images may not have the postgres dev requirements installed
3947
echo "Installing postgres requirements"
4048
if command -v uv > /dev/null 2>&1; then

docs/docs/configuration/alerts-reports.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ Screenshots will be taken but no messages actually sent as long as `ALERT_REPORT
3636
#### In your `Dockerfile`
3737

3838
You'll need to extend the Superset image to include a headless browser. Your options include:
39-
- Use Playwright with Chrome: this is the recommended approach as of version >=4.1.x. A working example of a Dockerfile that installs these tools is provided under Building your own production Docker image on the [Docker Builds](/docs/installation/docker-builds#building-your-own-production-docker-image) page. Read the code comments there as you'll also need to change a feature flag in your config.
39+
- Use Playwright with Chrome: this is the recommended approach as of version 4.1.x or greater. A working example of a Dockerfile that installs these tools is provided under "Building your own production Docker image" on the [Docker Builds](/docs/installation/docker-builds#building-your-own-production-docker-image) page. Read the code comments there as you'll also need to change a feature flag in your config.
4040
- Use Firefox: you'll need to install geckodriver and Firefox.
4141
- Use Chrome without Playwright: you'll need to install Chrome and set the value of `WEBDRIVER_TYPE` to `"chrome"` in your `superset_config.py`.
4242

43-
In Superset versions <=4.0x, users installed Firefox or Chrome and that was documented here.
43+
In Superset versions prior to 4.1, users installed Firefox or Chrome and that was documented here.
4444

4545
Only the worker container needs the browser.
4646

docs/docs/configuration/databases.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ are compatible with Superset.
6767
| [IBM Netezza Performance Server](/docs/configuration/databases#ibm-netezza-performance-server) | `pip install nzalchemy` | `netezza+nzpy://<UserName>:<DBPassword>@<Database Host>/<Database Name>` |
6868
| [MySQL](/docs/configuration/databases#mysql) | `pip install mysqlclient` | `mysql://<UserName>:<DBPassword>@<Database Host>/<Database Name>` |
6969
| [OceanBase](/docs/configuration/databases#oceanbase) | `pip install oceanbase_py` | `oceanbase://<UserName>:<DBPassword>@<Database Host>/<Database Name>` |
70-
| [Oracle](/docs/configuration/databases#oracle) | `pip install cx_Oracle` | `oracle://<username>:<password>@<hostname>:<port>` |
70+
| [Oracle](/docs/configuration/databases#oracle) | `pip install oracledb` | `oracle://<username>:<password>@<hostname>:<port>` |
7171
| [Parseable](/docs/configuration/databases#parseable) | `pip install sqlalchemy-parseable` | `parseable://<UserName>:<DBPassword>@<Database Host>/<Stream Name>` |
7272
| [PostgreSQL](/docs/configuration/databases#postgres) | `pip install psycopg2` | `postgresql://<UserName>:<DBPassword>@<Database Host>/<Database Name>` |
7373
| [Presto](/docs/configuration/databases#presto) | `pip install pyhive` | `presto://{username}:{password}@{hostname}:{port}/{database}` |

docs/docs/configuration/theming.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: 1
77
# Theming Superset
88

99
:::note
10-
apache-superset>=6.0
10+
`apache-superset>=6.0`
1111
:::
1212

1313
Superset now rides on **Ant Design v5's token-based theming**.

docs/docs/contributing/guidelines.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Committers may also update title to reflect the issue/PR content if the author-p
130130

131131
If the PR passes CI tests and does not have any `need:` labels, it is ready for review, add label `review` and/or `design-review`.
132132

133-
If an issue/PR has been inactive for >=30 days, it will be closed. If it does not have any status label, add `inactive`.
133+
If an issue/PR has been inactive for at least 30 days, it will be closed. If it does not have any status label, add `inactive`.
134134

135135
When creating a PR, if you're aiming to have it included in a specific release, please tag it with the version label. For example, to have a PR considered for inclusion in Superset 1.1 use the label `v1.1`.
136136

helm/superset/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ maintainers:
2929
- name: craig-rueda
3030
3131
url: https://github.com/craig-rueda
32-
version: 0.15.0 # See [README](https://github.com/apache/superset/blob/master/helm/superset/README.md#versioning) for version details.
32+
version: 0.15.1 # See [README](https://github.com/apache/superset/blob/master/helm/superset/README.md#versioning) for version details.
3333
dependencies:
3434
- name: postgresql
3535
version: 13.4.4

helm/superset/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ NOTE: This file is generated by helm-docs: https://github.com/norwoodj/helm-docs
2323

2424
# superset
2525

26-
![Version: 0.15.0](https://img.shields.io/badge/Version-0.15.0-informational?style=flat-square)
26+
![Version: 0.15.1](https://img.shields.io/badge/Version-0.15.1-informational?style=flat-square)
2727

2828
Apache Superset is a modern, enterprise-ready business intelligence web application
2929

@@ -203,6 +203,7 @@ On helm this can be set on `extraSecretEnv.SUPERSET_SECRET_KEY` or `configOverri
203203
| supersetNode.connections.db_name | string | `"superset"` | |
204204
| supersetNode.connections.db_pass | string | `"superset"` | |
205205
| supersetNode.connections.db_port | string | `"5432"` | |
206+
| supersetNode.connections.db_type | string | `"postgresql"` | Database type for Superset metadata (Supported types: "postgresql", "mysql") |
206207
| supersetNode.connections.db_user | string | `"superset"` | |
207208
| supersetNode.connections.redis_cache_db | string | `"1"` | |
208209
| supersetNode.connections.redis_celery_db | string | `"0"` | |

0 commit comments

Comments
 (0)