Skip to content

Commit 6646b24

Browse files
Merge branch 'master' into catalog-on-generated-query
2 parents fc38150 + 122bb68 commit 6646b24

File tree

28 files changed

+1384
-223
lines changed

28 files changed

+1384
-223
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ RUN mkdir -p /app/superset/static/assets \
5959
# NOTE: we mount packages and plugins as they are referenced in package.json as workspaces
6060
# ideally we'd COPY only their package.json. Here npm ci will be cached as long
6161
# as the full content of these folders don't change, yielding a decent cache reuse rate.
62-
# Note that's it's not possible selectively COPY of mount using blobs.
62+
# Note that it's not possible to selectively COPY or mount using blobs.
6363
RUN --mount=type=bind,source=./superset-frontend/package.json,target=./package.json \
6464
--mount=type=bind,source=./superset-frontend/package-lock.json,target=./package-lock.json \
6565
--mount=type=cache,target=/root/.cache \

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ athena = ["pyathena[pandas]>=2, <3"]
111111
aurora-data-api = ["preset-sqlalchemy-aurora-data-api>=0.2.8,<0.3"]
112112
bigquery = [
113113
"pandas-gbq>=0.19.1",
114-
"sqlalchemy-bigquery>=1.6.1",
114+
"sqlalchemy-bigquery>=1.15.0",
115115
"google-cloud-bigquery>=3.10.0",
116116
]
117117
clickhouse = ["clickhouse-connect>=0.5.14, <1.0"]

requirements/development.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ sqlalchemy==1.4.54
795795
# shillelagh
796796
# sqlalchemy-bigquery
797797
# sqlalchemy-utils
798-
sqlalchemy-bigquery==1.12.0
798+
sqlalchemy-bigquery==1.15.0
799799
# via apache-superset
800800
sqlalchemy-utils==0.38.3
801801
# via

superset-frontend/package-lock.json

Lines changed: 17 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

superset-frontend/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@
121121
"@visx/scale": "^3.5.0",
122122
"@visx/tooltip": "^3.0.0",
123123
"@visx/xychart": "^3.5.1",
124-
"ag-grid-community": "33.1.1",
125-
"ag-grid-react": "33.1.1",
124+
"ag-grid-community": "^34.0.2",
125+
"ag-grid-react": "34.0.2",
126126
"antd": "^5.24.6",
127127
"chrono-node": "^2.7.8",
128128
"classnames": "^2.2.5",

superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/TelemetryPixel.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919
import { render } from '@superset-ui/core/spec';
20-
import TelemetryPixel from '.';
20+
import { TelemetryPixel } from '.';
2121

2222
const OLD_ENV = process.env;
2323

superset-frontend/packages/superset-ui-core/src/components/TelemetryPixel/index.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ interface TelemetryPixelProps {
3939

4040
const PIXEL_ID = '0d3461e1-abb1-4691-a0aa-5ed50de66af0';
4141

42-
const TelemetryPixel = ({
42+
export const TelemetryPixel = ({
4343
version = 'unknownVersion',
4444
sha = 'unknownSHA',
4545
build = 'unknownBuild',
@@ -56,4 +56,3 @@ const TelemetryPixel = ({
5656
/>
5757
);
5858
};
59-
export default TelemetryPixel;

superset-frontend/packages/superset-ui-core/src/components/ThemeSelect/index.tsx

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)