Merge branch 'develop-3.0.0' of github.com:PlaidCloud/incubator-super…

…set into develop-3.1.1
PlaidCloud · Mar 21, 2024 · 67151c4 · 67151c4
2 parents 473286e + 3f79c79
commit 67151c4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -124,7 +124,7 @@ RUN chmod a+x /usr/bin/run-server.sh
 
 WORKDIR /app
 
-COPY --chmod=755 ./docker/run-server.sh /usr/bin/
+# COPY --chmod=755 ./docker/run-server.sh /usr/bin/
 USER superset
 
 HEALTHCHECK CMD curl -f "http://localhost:${SUPERSET_PORT}/health"
@@ -170,6 +170,8 @@ USER superset
 ######################################################################
 FROM lean AS ci
 
-COPY --chown=superset:superset --chmod=755 ./docker/*.sh /app/docker/
+# COPY --chown=superset --chmod=755 ./docker/*.sh /app/docker/
+COPY --chown=superset ./docker/*.sh /app/docker/
+RUN chmod a+x /app/docker/*.sh
 
 CMD ["/app/docker/docker-ci.sh"]
diff --git a/cloud-build/dev.yaml b/cloud-build/dev.yaml
@@ -13,7 +13,7 @@ steps:
       #   -t us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-py:$TAG_NAME \
       #   --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-py:$(cat tmp/py) \
       #   --target=superset-py \
-      #   --build-arg PY_VER=3.8.12 \
+      #   --build-arg PY_VER=3.9 \
       #   .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/node) ||
@@ -23,7 +23,7 @@ steps:
         -t us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$(cat tmp/node) \
         --target=superset-node \
-        --build-arg PY_VER=3.8.12 \
+        --build-arg PY_VER=3.9 \
         .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-production:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/production) ||
@@ -34,7 +34,7 @@ steps:
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-node:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-production:$(cat tmp/production) \
         --target lean \
-        --build-arg PY_VER=3.8.12 \
+        --build-arg PY_VER=3.9 \
         .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-ci:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/ci) ||
@@ -46,7 +46,7 @@ steps:
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-production:$TAG_NAME \
         --cache-from gus-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-ci:$(cat tmp/ci) \
         --target lean \
-        --build-arg PY_VER=3.8.12 \
+        --build-arg PY_VER=3.9 \
         .
 
       (docker pull "us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-dev:$_LAST_TAG" && echo "$_LAST_TAG" > tmp/dev) ||
@@ -58,7 +58,7 @@ steps:
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-production:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-ci:$TAG_NAME \
         --cache-from us-docker.pkg.dev/plaidcloud-build/us-plaidcloud/superset-dev:$(cat tmp/dev) \
-        --build-arg PY_VER=3.8.12 \
+        --build-arg PY_VER=3.9 \
         .
 
 substitutions:

diff --git a/superset/db_engine_specs/postgres.py b/superset/db_engine_specs/postgres.py
@@ -198,7 +198,7 @@ def convert_dttm(
 
 class PostgresEngineSpec(PostgresBaseEngineSpec, BasicParametersMixin):
     engine = "postgresql"
-    engine_aliases = {"postgres"}
+    engine_aliases = {"postgres", "greenplum"}
     supports_dynamic_schema = True
 
     default_driver = "psycopg2"