Skip to content

Commit 127cdaf

Browse files
authored
Merge branch 'apache:master' into feature/add_tab_select_with_save_chart
2 parents 547648f + 54eb631 commit 127cdaf

505 files changed

Lines changed: 66356 additions & 48534 deletions

File tree

Some content is hidden

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

.envrc.example

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
# Auto-configure Docker Compose for multi-instance support
19+
# Requires direnv: https://direnv.net/
20+
#
21+
# Install: brew install direnv (or apt install direnv)
22+
# Setup: Add 'eval "$(direnv hook bash)"' to ~/.bashrc (or ~/.zshrc)
23+
# Allow: Run 'direnv allow' in this directory once
24+
25+
# Generate unique project name from directory
26+
export COMPOSE_PROJECT_NAME=$(basename "$PWD" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g')
27+
28+
# Find available ports sequentially to avoid collisions
29+
_is_free() { ! lsof -i ":$1" &>/dev/null 2>&1; }
30+
31+
_p=80; while ! _is_free $_p; do ((_p++)); done; export NGINX_PORT=$_p
32+
_p=8088; while ! _is_free $_p; do ((_p++)); done; export SUPERSET_PORT=$_p
33+
_p=9000; while ! _is_free $_p; do ((_p++)); done; export NODE_PORT=$_p
34+
_p=8080; while ! _is_free $_p || [ $_p -eq $NGINX_PORT ]; do ((_p++)); done; export WEBSOCKET_PORT=$_p
35+
_p=8081; while ! _is_free $_p || [ $_p -eq $WEBSOCKET_PORT ]; do ((_p++)); done; export CYPRESS_PORT=$_p
36+
_p=5432; while ! _is_free $_p; do ((_p++)); done; export DATABASE_PORT=$_p
37+
_p=6379; while ! _is_free $_p; do ((_p++)); done; export REDIS_PORT=$_p
38+
39+
unset _p _is_free
40+
41+
echo "🐳 Superset configured: http://localhost:$SUPERSET_PORT (dev: localhost:$NODE_PORT)"

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ body:
4141
label: Superset version
4242
options:
4343
- master / latest-dev
44+
- "6.0.0"
4445
- "5.0.0"
45-
- "4.1.3"
4646
validations:
4747
required: true
4848
- type: dropdown

.github/workflows/bashlib.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,19 @@ testdata() {
117117
say "::endgroup::"
118118
}
119119

120+
playwright_testdata() {
121+
cd "$GITHUB_WORKSPACE"
122+
say "::group::Load all examples for Playwright tests"
123+
# must specify PYTHONPATH to make `tests.superset_test_config` importable
124+
export PYTHONPATH="$GITHUB_WORKSPACE"
125+
pip install -e .
126+
superset db upgrade
127+
superset load_test_users
128+
superset load_examples
129+
superset init
130+
say "::endgroup::"
131+
}
132+
120133
celery-worker() {
121134
cd "$GITHUB_WORKSPACE"
122135
say "::group::Start Celery worker"

.github/workflows/bump-python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
steps:
3333

3434
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
35-
uses: actions/checkout@v5
35+
uses: actions/checkout@v6
3636
with:
3737
persist-credentials: true
3838
ref: master

.github/workflows/cancel_duplicates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
3232
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
3333
if: steps.check_queued.outputs.count >= 20
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535

3636
- name: Cancel duplicate workflow runs
3737
if: steps.check_queued.outputs.count >= 20

.github/workflows/check-python-deps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-22.04
1919
steps:
2020
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222
with:
2323
persist-credentials: false
2424
submodules: recursive

.github/workflows/check_db_migration_confict.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
pull-requests: write
2626
steps:
2727
- name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )"
28-
uses: actions/checkout@v5
28+
uses: actions/checkout@v6
2929
- name: Check and notify
3030
uses: actions/github-script@v8
3131
with:

.github/workflows/claude.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
id-token: write
7272
steps:
7373
- name: Checkout repository
74-
uses: actions/checkout@v5
74+
uses: actions/checkout@v6
7575
with:
7676
fetch-depth: 1
7777

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
steps:
3333
- name: Checkout repository
34-
uses: actions/checkout@v5
34+
uses: actions/checkout@v6
3535

3636
- name: Check for file changes
3737
id: check

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-24.04
2828
steps:
2929
- name: "Checkout Repository"
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@v6
3131
- name: "Dependency Review"
3232
uses: actions/dependency-review-action@v4
3333
continue-on-error: true
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-22.04
5454
steps:
5555
- name: "Checkout Repository"
56-
uses: actions/checkout@v5
56+
uses: actions/checkout@v6
5757

5858
- name: Setup Python
5959
uses: ./.github/actions/setup-backend/

0 commit comments

Comments
 (0)