Skip to content

Commit

Permalink
Merge branch 'ref-get-sqla-engine-2' of https://github.com/apache/sup…
Browse files Browse the repository at this point in the history
…erset into ref-get-sqla-engine-2
  • Loading branch information
hughhhh committed Nov 14, 2022
2 parents b05f0e8 + 7ce5836 commit 12b05bd
Show file tree
Hide file tree
Showing 82 changed files with 3,746 additions and 185 deletions.
1 change: 1 addition & 0 deletions RESOURCES/FEATURE_FLAGS.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ These features are **finished** but currently being tested. They are usable, but
- ALERT_REPORTS: [(docs)](https://superset.apache.org/docs/installation/alerts-reports)
- ALLOW_FULL_CSV_EXPORT
- CACHE_IMPERSONATION
- CONFIRM_DASHBOARD_DIFF
- DASHBOARD_EDIT_CHART_IN_NEW_TAB
- DASHBOARD_FILTERS_EXPERIMENTAL
- DASHBOARD_NATIVE_FILTERS
Expand Down
1 change: 1 addition & 0 deletions UPDATING.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ assists people when migrating to a new version.
- [21002](https://github.com/apache/superset/pull/21002): Support Python 3.10 and bump pandas 1.4 and pyarrow 6.
- [21163](https://github.com/apache/superset/pull/21163): When `GENERIC_CHART_AXES` feature flags set to `True`, the Time Grain control will move below the X-Axis control.
- [21284](https://github.com/apache/superset/pull/21284): The non-functional `MAX_TABLE_NAMES` config key has been removed.
- [21794](https://github.com/apache/superset/pull/21794): Deprecates the undocumented `PRESTO_SPLIT_VIEWS_FROM_TABLES` feature flag. Now for Presto, like other engines, only physical tables are treated as tables.

### Breaking Changes

Expand Down
2 changes: 1 addition & 1 deletion helm/superset/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ maintainers:
- name: craig-rueda
email: [email protected]
url: https://github.com/craig-rueda
version: 0.7.6
version: 0.7.7
dependencies:
- name: postgresql
version: 11.1.22
Expand Down
2 changes: 1 addition & 1 deletion helm/superset/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

# superset

![Version: 0.7.6](https://img.shields.io/badge/Version-0.7.6-informational?style=flat-square)
![Version: 0.7.7](https://img.shields.io/badge/Version-0.7.7-informational?style=flat-square)

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

Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/configmap-superset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ metadata:
chart: {{ template "superset.chart" . }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
namespace: {{ .Release.Namespace }}
data:
{{- range $path, $config := .Values.extraConfigs }}
{{ $path }}: |
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/deployment-beat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ metadata:
annotations:
{{- toYaml .Values.supersetCeleryBeat.deploymentAnnotations | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
# This must be a singleton
replicas: 1
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/deployment-flower.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ metadata:
annotations:
{{- toYaml .Values.supersetCeleryFlower.deploymentAnnotations | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
replicas: {{ .Values.supersetCeleryFlower.replicaCount }}
selector:
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/deployment-worker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ metadata:
annotations:
{{- toYaml .Values.supersetWorker.deploymentAnnotations | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
replicas: {{ .Values.supersetWorker.replicaCount }}
selector:
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/deployment-ws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ metadata:
annotations:
{{- toYaml .Values.supersetWebsockets.deploymentAnnotations | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
replicas: {{ .Values.supersetWebsockets.replicaCount }}
selector:
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ metadata:
annotations:
{{- toYaml .Values.supersetNode.deploymentAnnotations | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
replicas: {{ .Values.supersetNode.replicaCount }}
{{- if .Values.supersetNode.strategy }}
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ metadata:
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
{{- if .Values.ingress.ingressClassName }}
ingressClassName: {{ .Values.ingress.ingressClassName }}
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/init-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ metadata:
annotations:
"helm.sh/hook": post-install,post-upgrade
"helm.sh/hook-delete-policy": "before-hook-creation"
namespace: {{ .Release.Namespace }}
spec:
template:
metadata:
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/secret-env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ metadata:
chart: {{ template "superset.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
namespace: {{ .Release.Namespace }}
type: Opaque
stringData:
REDIS_HOST: {{ tpl .Values.supersetNode.connections.redis_host . | quote }}
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/secret-superset-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ metadata:
chart: {{ template "superset.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
namespace: {{ .Release.Namespace }}
type: Opaque
stringData:
superset_config.py: |
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/secret-ws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ metadata:
chart: {{ template "superset.chart" . }}
release: "{{ .Release.Name }}"
heritage: "{{ .Release.Service }}"
namespace: {{ .Release.Namespace }}
type: Opaque
stringData:
config.json: |
Expand Down
1 change: 1 addition & 0 deletions helm/superset/templates/service-account.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,5 @@ metadata:
{{- if .Values.serviceAccount.annotations }}
annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
{{- end -}}
3 changes: 3 additions & 0 deletions helm/superset/templates/service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ metadata:
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
type: {{ .Values.service.type }}
ports:
Expand Down Expand Up @@ -55,6 +56,7 @@ metadata:
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
type: {{ .Values.supersetCeleryFlower.service.type }}
ports:
Expand Down Expand Up @@ -84,6 +86,7 @@ metadata:
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
namespace: {{ .Release.Namespace }}
spec:
type: {{ .Values.supersetWebsockets.service.type }}
ports:
Expand Down
2 changes: 0 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@ geopy==2.2.0
# via apache-superset
graphlib-backport==1.0.3
# via apache-superset
greenlet==1.1.2
# via sqlalchemy
gunicorn==20.1.0
# via apache-superset
hashids==1.3.1
Expand Down
2 changes: 1 addition & 1 deletion requirements/development.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ pure-eval==0.2.2
# via stack-data
pure-sasl==0.6.2
# via thrift-sasl
pydruid==0.6.2
pydruid==0.6.5
# via apache-superset
pygments==2.12.0
# via ipython
Expand Down
2 changes: 2 additions & 0 deletions requirements/docker.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
# -r requirements/docker.in
gevent==21.8.0
# via -r requirements/docker.in
greenlet==1.1.3.post0
# via gevent
psycopg2-binary==2.9.1
# via apache-superset
zope-event==4.5.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/testing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ rsa==4.7.2
# via google-auth
statsd==3.3.0
# via -r requirements/testing.in
trino==0.315.0
trino==0.319.0
# via apache-superset
typing-inspect==0.7.1
# via libcst
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def get_git_sha() -> str:
"db2": ["ibm-db-sa>=0.3.5, <0.4"],
"dremio": ["sqlalchemy-dremio>=1.1.5, <1.3"],
"drill": ["sqlalchemy-drill==0.1.dev"],
"druid": ["pydruid>=0.6.1,<0.7"],
"druid": ["pydruid>=0.6.5,<0.7"],
"solr": ["sqlalchemy-solr >= 0.2.0"],
"elasticsearch": ["elasticsearch-dbapi>=0.2.9, <0.3.0"],
"exasol": ["sqlalchemy-exasol >= 2.4.0, <3.0"],
Expand All @@ -160,7 +160,7 @@ def get_git_sha() -> str:
"pinot": ["pinotdb>=0.3.3, <0.4"],
"postgres": ["psycopg2-binary==2.9.1"],
"presto": ["pyhive[presto]>=0.6.5"],
"trino": ["trino>=0.313.0"],
"trino": ["trino>=0.319.0"],
"prophet": ["prophet>=1.0.1, <1.1", "pystan<3.0"],
"redshift": ["sqlalchemy-redshift>=0.8.1, < 0.9"],
"rockset": ["rockset>=0.8.10, <0.9"],
Expand Down
3 changes: 2 additions & 1 deletion superset-frontend/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ module.exports = {
builder: 'webpack5',
},
stories: [
'../src/@(components|common|filters|explore)/**/*.stories.@(tsx|jsx|mdx)',
'../src/@(components|common|filters|explore)/**/*.stories.@(tsx|jsx)',
'../src/@(components|common|filters|explore)/**/*.*.@(mdx)',
],
addons: [
'@storybook/addon-essentials',
Expand Down
10 changes: 9 additions & 1 deletion superset-frontend/.storybook/preview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,15 @@ addParameters({
['Controls', 'Display', 'Feedback', 'Input', '*'],
['Overview', 'Examples', '*'],
'Design System',
['Foundations', 'Components', 'Patterns', '*'],
[
'Introduction',
'Foundations',
'Components',
['Overview', 'Examples', '*'],
'Patterns',
'*',
],
['Overview', 'Examples', '*'],
'*',
],
},
Expand Down
Loading

0 comments on commit 12b05bd

Please sign in to comment.