From 723ef591a537034d79ab1b6a971c8e437ce1ab11 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 18 Dec 2024 21:03:01 -0800 Subject: [PATCH] fix: add various recent issues on master CI (#31561) --- .github/workflows/dependency-review.yml | 5 ++++- .github/workflows/docker.yml | 1 + .github/workflows/ephemeral-env.yml | 2 ++ .github/workflows/tag-release.yml | 1 + pyproject.toml | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index ca6f374bd..0b98678bb 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -23,6 +23,7 @@ permissions: jobs: dependency-review: + if: github.event_name == 'pull_request' runs-on: ubuntu-22.04 steps: - name: "Checkout Repository" @@ -53,10 +54,12 @@ jobs: - name: Setup Python uses: ./.github/actions/setup-backend/ + with: + requirements-type: base - name: "Set up liccheck" run: | - pip install liccheck + uv pip install --system liccheck - name: "Run liccheck" run: | # run the checks diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 93a9d4c9f..91256651f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -76,6 +76,7 @@ jobs: fi supersetbot docker \ + --push \ --preset ${{ matrix.build_preset }} \ --context "$EVENT" \ --context-ref "$RELEASE" $FORCE_LATEST \ diff --git a/.github/workflows/ephemeral-env.yml b/.github/workflows/ephemeral-env.yml index ba4231532..92a0512b0 100644 --- a/.github/workflows/ephemeral-env.yml +++ b/.github/workflows/ephemeral-env.yml @@ -158,6 +158,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | supersetbot docker \ + --push \ + --load \ --preset ci \ --platform linux/amd64 \ --context-ref "$RELEASE" \ diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index ce7e35b48..096b1dfa1 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -87,6 +87,7 @@ jobs: fi supersetbot docker \ + --push \ --preset ${{ matrix.build_preset }} \ --context "$EVENT" \ --context-ref "$RELEASE" $FORCE_LATEST \ diff --git a/pyproject.toml b/pyproject.toml index 260110efe..39cb3c130 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -215,7 +215,7 @@ combine_as_imports = true include_trailing_comma = true line_length = 88 known_first_party = "superset" -known_third_party = "alembic, apispec, backoff, celery, click, colorama, cron_descriptor, croniter, cryptography, dateutil, deprecation, flask, flask_appbuilder, flask_babel, flask_caching, flask_compress, flask_jwt_extended, flask_login, flask_migrate, flask_sqlalchemy, flask_talisman, flask_testing, flask_wtf, freezegun, geohash, geopy, holidays, humanize, isodate, jinja2, jwt, markdown, markupsafe, marshmallow, msgpack, nh3, numpy, pandas, parameterized, parsedatetime, pgsanity, pkg_resources, polyline, prison, progress, pyarrow, sqlalchemy_bigquery, pyhive, pyparsing, pytest, pytest_mock, pytz, redis, requests, selenium, setuptools, shillelagh, simplejson, slack, sqlalchemy, sqlalchemy_utils, sqlparse, typing_extensions, urllib3, werkzeug, wtforms, wtforms_json, yaml" +known_third_party = "alembic, apispec, backoff, celery, click, colorama, cron_descriptor, croniter, cryptography, dateutil, deprecation, flask, flask_appbuilder, flask_babel, flask_caching, flask_compress, flask_jwt_extended, flask_login, flask_migrate, flask_sqlalchemy, flask_talisman, flask_testing, flask_wtf, freezegun, geohash, geopy, holidays, humanize, isodate, jinja2, jwt, markdown, markupsafe, marshmallow, msgpack, nh3, numpy, pandas, parameterized, parsedatetime, pgsanity, polyline, prison, progress, pyarrow, sqlalchemy_bigquery, pyhive, pyparsing, pytest, pytest_mock, pytz, redis, requests, selenium, setuptools, shillelagh, simplejson, slack, sqlalchemy, sqlalchemy_utils, sqlparse, typing_extensions, urllib3, werkzeug, wtforms, wtforms_json, yaml" multi_line_output = 3 order_by_type = false