From ff0e6e4b445b9a11e14fdf84d7332231654181b9 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Thu, 4 Apr 2024 09:53:17 -0700 Subject: [PATCH 1/9] chore: [proposal] de-matrix python-version in GHAs In this PR: - simplifying the single-item matrix (python-version) to NOT using a matrix. I'm guessing the reason we currently have a single-item matrix is an artifact of supporting multiple version in the past, and/or making it easy to go multi-python-version checks in the future, but there's a burden associated, especially around how this relates to "required checks" specified in .asf.yml - leveraging the `setup-backend`'s default for python version, making the main python version we use much more DRY. - fixing/simplifying the related no-op. We'll need new ones, but will be able to deprecate a bunch and simplify things. For instance, when we migrate to 3.11 in the future, we won't have to manage a bunch of python-version-specific no-ops About supporting multiple/future version of python, I'd argue that we should focus on a single one for a given CI run, and that if/when we need to CI against multiple version, we run a FULL test suite punctually in a dedicate PR/branch/ref. Point being, it's expensive for every commit to validate multiple versions of python and in many ways its not necessary. Currently our multi-python-version support is dubious at best, with only few checks that run against multiple versions. I really think we should pick a single version and support it very well. If/when we want to upgrade python version, we'd cut a PR and run CI for that purpose. If we want to continuously, actively support multiple python versions (and I don't think we should!), I'd suggest either a release-specific procedure (release manager using release branch, running full CI for that version/release) and/or a nightly job that would keep an eye on that version of python. --- .asf.yaml | 17 ++++++++--------- .github/actions/setup-backend/action.yml | 18 ++++++++++++------ .github/workflows/pre-commit.yml | 3 --- .github/workflows/superset-cli.yml | 3 --- .github/workflows/superset-helm-lint.yml | 5 +++-- .../superset-python-integrationtest.yml | 19 ++++++++----------- .github/workflows/superset-python-misc.yml | 10 ---------- .../workflows/superset-python-presto-hive.yml | 6 ------ .../workflows/superset-python-unittest.yml | 5 ----- .github/workflows/superset-translations.yml | 5 ----- 10 files changed, 31 insertions(+), 60 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 9b2bfae806ada..106a9c39b7326 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -67,15 +67,14 @@ github: - cypress-matrix (2, chrome) - cypress-matrix (3, chrome) - frontend-build - - pre-commit (3.10) - - python-lint (3.10) - - test-mysql (3.10) - - test-postgres (3.10) - - test-postgres (3.11) - - test-postgres-hive (3.10) - - test-postgres-presto (3.10) - - test-sqlite (3.10) - - unit-tests (3.10) + - pre-commit + - python-lint + - test-mysql + - test-postgres + - test-postgres-hive + - test-postgres-presto + - test-sqlite + - unit-tests required_pull_request_reviews: dismiss_stale_reviews: false diff --git a/.github/actions/setup-backend/action.yml b/.github/actions/setup-backend/action.yml index 5f6ba8d1a02f0..ce7f0208b5c91 100644 --- a/.github/actions/setup-backend/action.yml +++ b/.github/actions/setup-backend/action.yml @@ -13,6 +13,10 @@ inputs: description: 'Type of requirements to install. Options: base, development, default' required: false default: 'dev' + install-superset: + description: 'Whether to install Superset itself. If false, only python is installed' + required: false + default: 'true' runs: using: 'composite' @@ -24,11 +28,13 @@ runs: cache: ${{ inputs.cache }} - name: Install dependencies run: | - sudo apt-get update && sudo apt-get -y install libldap2-dev libsasl2-dev - pip install --upgrade pip setuptools wheel - if [ "${{ inputs.requirements-type }}" = "dev" ]; then - pip install -r requirements/development.txt - elif [ "${{ inputs.requirements-type }}" = "base" ]; then - pip install -r requirements/base.txt + if [ "${{ inputs.install-superset }}" = "true" ]; then + sudo apt-get update && sudo apt-get -y install libldap2-dev libsasl2-dev + pip install --upgrade pip setuptools wheel + if [ "${{ inputs.requirements-type }}" = "dev" ]; then + pip install -r requirements/development.txt + elif [ "${{ inputs.requirements-type }}" = "base" ]; then + pip install -r requirements/base.txt + fi fi shell: bash diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 27af14d224d6b..541b4a8bfc58a 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -16,9 +16,6 @@ concurrency: jobs: pre-commit: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v4 diff --git a/.github/workflows/superset-cli.yml b/.github/workflows/superset-cli.yml index 1d9870a0b2c0b..3c98198c7e730 100644 --- a/.github/workflows/superset-cli.yml +++ b/.github/workflows/superset-cli.yml @@ -16,9 +16,6 @@ concurrency: jobs: test-load-examples: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config diff --git a/.github/workflows/superset-helm-lint.yml b/.github/workflows/superset-helm-lint.yml index f16dd61fdde3b..f9e068318d2e3 100644 --- a/.github/workflows/superset-helm-lint.yml +++ b/.github/workflows/superset-helm-lint.yml @@ -27,9 +27,10 @@ jobs: with: version: v3.5.4 - - uses: actions/setup-python@v5 + - name: Setup Python + uses: ./.github/actions/setup-backend/ with: - python-version: "3.10" + install-superset: 'false' - name: Set up chart-testing uses: ./.github/actions/chart-testing-action diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml index 4d710d5bb5900..e23fa6a1b7a9a 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -16,9 +16,6 @@ concurrency: jobs: test-mysql: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -50,9 +47,13 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Python uses: ./.github/actions/setup-backend/ +<<<<<<< HEAD if: steps.check.outputs.python with: python-version: ${{ matrix.python-version }} +======= + if: steps.check.outcome == 'failure' +>>>>>>> a4e39cdaaf (chore: [proposal] de-matrix python-version in GHAs) - name: Setup MySQL if: steps.check.outputs.python uses: ./.github/actions/cached-dependencies @@ -72,9 +73,6 @@ jobs: bash .github/workflows/codecov.sh -c -F python -F mysql test-postgres: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10", "3.11"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -107,9 +105,13 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Python uses: ./.github/actions/setup-backend/ +<<<<<<< HEAD if: steps.check.outputs.python with: python-version: ${{ matrix.python-version }} +======= + if: steps.check.outcome == 'failure' +>>>>>>> a4e39cdaaf (chore: [proposal] de-matrix python-version in GHAs) - name: Setup Postgres if: steps.check.outputs.python uses: ./.github/actions/cached-dependencies @@ -130,9 +132,6 @@ jobs: test-sqlite: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -160,8 +159,6 @@ jobs: - name: Setup Python uses: ./.github/actions/setup-backend/ if: steps.check.outputs.python - with: - python-version: ${{ matrix.python-version }} - name: Install dependencies if: steps.check.outputs.python uses: ./.github/actions/cached-dependencies diff --git a/.github/workflows/superset-python-misc.yml b/.github/workflows/superset-python-misc.yml index 2aacf8799be11..57a5b748515e1 100644 --- a/.github/workflows/superset-python-misc.yml +++ b/.github/workflows/superset-python-misc.yml @@ -17,9 +17,6 @@ concurrency: jobs: python-lint: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v4 @@ -34,8 +31,6 @@ jobs: - name: Setup Python uses: ./.github/actions/setup-backend/ if: steps.check.outputs.python - with: - python-version: ${{ matrix.python-version }} - name: pylint if: steps.check.outputs.python # `-j 0` run Pylint in parallel @@ -43,9 +38,6 @@ jobs: babel-extract: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v4 @@ -60,8 +52,6 @@ jobs: - name: Setup Python if: steps.check.outputs.python uses: ./.github/actions/setup-backend/ - with: - python-version: ${{ matrix.python-version }} - name: Test babel extraction if: steps.check.outputs.python run: flask fab babel-extract --target superset/translations --output superset/translations/messages.pot --config superset/translations/babel.cfg -k _,__,t,tn,tct diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml index 66c6952c7d318..cf3e506bb9ccf 100644 --- a/.github/workflows/superset-python-presto-hive.yml +++ b/.github/workflows/superset-python-presto-hive.yml @@ -17,9 +17,6 @@ concurrency: jobs: test-postgres-presto: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -84,9 +81,6 @@ jobs: test-postgres-hive: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config diff --git a/.github/workflows/superset-python-unittest.yml b/.github/workflows/superset-python-unittest.yml index 48e2c21c26373..99b28cfb12e07 100644 --- a/.github/workflows/superset-python-unittest.yml +++ b/.github/workflows/superset-python-unittest.yml @@ -17,9 +17,6 @@ concurrency: jobs: unit-tests: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10", "3.11"] env: PYTHONPATH: ${{ github.workspace }} steps: @@ -36,8 +33,6 @@ jobs: - name: Setup Python uses: ./.github/actions/setup-backend/ if: steps.check.outputs.python - with: - python-version: ${{ matrix.python-version }} - name: Python unit tests if: steps.check.outputs.python env: diff --git a/.github/workflows/superset-translations.yml b/.github/workflows/superset-translations.yml index 734e9bf752abc..42cf76cdf19d6 100644 --- a/.github/workflows/superset-translations.yml +++ b/.github/workflows/superset-translations.yml @@ -47,9 +47,6 @@ jobs: babel-extract: runs-on: ubuntu-20.04 - strategy: - matrix: - python-version: ["3.10"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v4 @@ -65,8 +62,6 @@ jobs: - name: Setup Python if: steps.check.outputs.python uses: ./.github/actions/setup-backend/ - with: - python-version: ${{ matrix.python-version }} - name: Test babel extraction if: steps.check.outputs.python run: ./scripts/babel_update.sh From 915cbc1ffc2111350ba1f754fd5a27ba5bfe8e74 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Mon, 8 Apr 2024 18:12:10 -0700 Subject: [PATCH 2/9] rebased --- .../workflows/superset-python-integrationtest.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml index e23fa6a1b7a9a..2a69a2e9629cd 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -47,19 +47,12 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Python uses: ./.github/actions/setup-backend/ -<<<<<<< HEAD if: steps.check.outputs.python - with: - python-version: ${{ matrix.python-version }} -======= - if: steps.check.outcome == 'failure' ->>>>>>> a4e39cdaaf (chore: [proposal] de-matrix python-version in GHAs) - name: Setup MySQL if: steps.check.outputs.python uses: ./.github/actions/cached-dependencies with: - run: | - setup-mysql + run: setup-mysql - name: Run celery if: steps.check.outputs.python run: celery --app=superset.tasks.celery_app:app worker -Ofair -c 2 & @@ -105,13 +98,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Setup Python uses: ./.github/actions/setup-backend/ -<<<<<<< HEAD if: steps.check.outputs.python - with: - python-version: ${{ matrix.python-version }} -======= - if: steps.check.outcome == 'failure' ->>>>>>> a4e39cdaaf (chore: [proposal] de-matrix python-version in GHAs) - name: Setup Postgres if: steps.check.outputs.python uses: ./.github/actions/cached-dependencies From 664bf8593e2a4ff92fd57393f1d406b3bca3450e Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 9 Apr 2024 08:58:49 -0700 Subject: [PATCH 3/9] re-introducing no-op momentarily - to be deleted --- .github/workflows/no-op.yml | 96 +++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 .github/workflows/no-op.yml diff --git a/.github/workflows/no-op.yml b/.github/workflows/no-op.yml new file mode 100644 index 0000000000000..e56177239baf8 --- /dev/null +++ b/.github/workflows/no-op.yml @@ -0,0 +1,96 @@ +# no-op.yml +# +# Purpose: +# This workflow provides a workaround for the "required status checks" feature in GitHub Actions +# when using path-specific conditions in other workflows. Required checks might remain in a "Pending" +# state if the conditions are not met, thus blocking pull requests from being merged. +# This no-op (no operation) workflow provides dummy success statuses for these required jobs when +# the real jobs do not run due to path-specific conditions. +# +# How it works: +# - It defines jobs with the same names as the required jobs in the main workflows. +# - These jobs simply execute a command (`exit 0`) to succeed immediately. +# - When a pull request is created or updated, both this no-op workflow and the main workflows are triggered. +# - If the main workflows' jobs don't run (due to path conditions), these no-op jobs provide successful statuses. +# - If the main workflows' jobs do run and fail, their failure statuses take precedence, +# ensuring that pull requests are not merged with failing checks. +# +# Usage: +# - Ensure that the job names in this workflow match exactly the names of the corresponding jobs in the main workflows. +# - This workflow should be kept as-is, without path-specific conditions. + +name: no-op Checks +on: pull_request + +jobs: + frontend-build: + runs-on: ubuntu-latest + steps: + - name: No-op for frontend-build + run: exit 0 + + pre-commit: + strategy: + matrix: + python-version: ["3.10"] + runs-on: ubuntu-latest + steps: + - name: No-op for pre-commit + run: exit 0 + + python-lint: + strategy: + matrix: + python-version: ["3.10"] + runs-on: ubuntu-latest + steps: + - name: No-op for python-lint + run: exit 0 + test-postgres-hive: + strategy: + matrix: + python-version: ["3.10"] + runs-on: ubuntu-latest + steps: + - name: No-op for frontend-build + run: exit 0 + test-postgres-presto: + strategy: + matrix: + python-version: ["3.10"] + runs-on: ubuntu-latest + steps: + - name: No-op for frontend-build + run: exit 0 + unit-tests: + strategy: + matrix: + python-version: ["3.10"] + runs-on: ubuntu-latest + steps: + - name: No-op for frontend-build + run: exit 0 + test-mysql: + strategy: + matrix: + python-version: ["3.10"] + runs-on: ubuntu-latest + steps: + - name: No-op for test-mysql + run: exit 0 + test-postgres: + strategy: + matrix: + python-version: ["3.10", "3.11"] + runs-on: ubuntu-latest + steps: + - name: No-op for test-postgres + run: exit 0 + test-sqlite: + strategy: + matrix: + python-version: ["3.10"] + runs-on: ubuntu-latest + steps: + - name: No-op for test-sqlite + run: exit 0 From e217f31404a60569f8701f8b4970b9aba9ee9d0b Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 10 Apr 2024 12:09:42 -0700 Subject: [PATCH 4/9] setup-backend now supports 'current' and 'future' --- .asf.yaml | 3 ++- .github/actions/setup-backend/action.yml | 19 +++++++++++++++---- .../superset-python-integrationtest.yml | 5 +++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 106a9c39b7326..8d4d32813cf38 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -70,7 +70,8 @@ github: - pre-commit - python-lint - test-mysql - - test-postgres + - test-postgres (current) + - test-postgres (future) - test-postgres-hive - test-postgres-presto - test-sqlite diff --git a/.github/actions/setup-backend/action.yml b/.github/actions/setup-backend/action.yml index ce7f0208b5c91..9e48c35c83d3a 100644 --- a/.github/actions/setup-backend/action.yml +++ b/.github/actions/setup-backend/action.yml @@ -2,9 +2,9 @@ name: 'Setup Python Environment' description: 'Set up Python and install dependencies with optional configurations.' inputs: python-version: - description: 'Python version to set up.' + description: 'Python version to set up. Accepts a version number, "current", or "future".' required: true - default: '3.10' + default: 'current' cache: description: 'Cache dependencies. Options: pip' required: false @@ -21,10 +21,21 @@ inputs: runs: using: 'composite' steps: - - name: Set up Python ${{ inputs.python-version }} + - name: Interpret Python Version + id: set-python-version + shell: bash + run: | + if [ "${{ inputs.python-version }}" = "current" ]; then + echo "PYTHON_VERSION=3.10" >> $GITHUB_ENV + elif [ "${{ inputs.python-version }}" = "future" ]; then + echo "PYTHON_VERSION=3.11" >> $GITHUB_ENV + else + echo "PYTHON_VERSION=${{ inputs.python-version }}" >> $GITHUB_ENV + fi + - name: Set up Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@v5 with: - python-version: ${{ inputs.python-version }} + python-version: ${{ env.PYTHON_VERSION }} cache: ${{ inputs.cache }} - name: Install dependencies run: | diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml index 2a69a2e9629cd..4fa21c64bb9d2 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -66,6 +66,9 @@ jobs: bash .github/workflows/codecov.sh -c -F python -F mysql test-postgres: runs-on: ubuntu-20.04 + strategy: + matrix: + python-version: ["current", "future"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -99,6 +102,8 @@ jobs: - name: Setup Python uses: ./.github/actions/setup-backend/ if: steps.check.outputs.python + with: + python-version: ${{ matrix.python-version }} - name: Setup Postgres if: steps.check.outputs.python uses: ./.github/actions/cached-dependencies From 94542c14ffc01ad2ce0ae92d5593efc66e510f11 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 10 Apr 2024 12:18:14 -0700 Subject: [PATCH 5/9] bycatch, add GITHUB_TOKEN for docker builds --- .github/workflows/docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 18001241ab830..e749ac35c812c 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -73,6 +73,8 @@ jobs: - name: Build Docker Image if: steps.check.outputs.python || steps.check.outputs.frontend || steps.check.outputs.docker shell: bash + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | # Single platform builds in pull_request context to speed things up if [ "${{ github.event_name }}" = "push" ]; then From 4a15f8e1537edeb9d617f3a0d6b1de1fa71ffe6f Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 10 Apr 2024 12:33:26 -0700 Subject: [PATCH 6/9] fix yaml --- .github/workflows/superset-python-integrationtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml index 4fa21c64bb9d2..0b6fa35523e2b 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["current", "future"] + python-version: ["current", "future"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config From 5e439906446591a2424e3eabc065b7e8b2e88adc Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 10 Apr 2024 12:51:23 -0700 Subject: [PATCH 7/9] rename future to next --- .asf.yaml | 2 +- .github/actions/setup-backend/action.yml | 4 ++-- .github/workflows/superset-python-integrationtest.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 8d4d32813cf38..c9c01cbd70d2b 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -71,7 +71,7 @@ github: - python-lint - test-mysql - test-postgres (current) - - test-postgres (future) + - test-postgres (next) - test-postgres-hive - test-postgres-presto - test-sqlite diff --git a/.github/actions/setup-backend/action.yml b/.github/actions/setup-backend/action.yml index 9e48c35c83d3a..4f97916dbee7a 100644 --- a/.github/actions/setup-backend/action.yml +++ b/.github/actions/setup-backend/action.yml @@ -2,7 +2,7 @@ name: 'Setup Python Environment' description: 'Set up Python and install dependencies with optional configurations.' inputs: python-version: - description: 'Python version to set up. Accepts a version number, "current", or "future".' + description: 'Python version to set up. Accepts a version number, "current", or "next".' required: true default: 'current' cache: @@ -27,7 +27,7 @@ runs: run: | if [ "${{ inputs.python-version }}" = "current" ]; then echo "PYTHON_VERSION=3.10" >> $GITHUB_ENV - elif [ "${{ inputs.python-version }}" = "future" ]; then + elif [ "${{ inputs.python-version }}" = "next" ]; then echo "PYTHON_VERSION=3.11" >> $GITHUB_ENV else echo "PYTHON_VERSION=${{ inputs.python-version }}" >> $GITHUB_ENV diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml index 0b6fa35523e2b..2c1e721df479d 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -68,7 +68,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["current", "future"] + python-version: ["current", "next"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config From 3fd2839b71802dc9e5095d66b31589f6647043b1 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 10 Apr 2024 12:55:50 -0700 Subject: [PATCH 8/9] run pytest on next version as well --- .asf.yaml | 3 ++- .github/workflows/superset-python-unittest.yml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index c9c01cbd70d2b..5620ca3623ea5 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -75,7 +75,8 @@ github: - test-postgres-hive - test-postgres-presto - test-sqlite - - unit-tests + - unit-tests (current) + - unit-tests (netxt) required_pull_request_reviews: dismiss_stale_reviews: false diff --git a/.github/workflows/superset-python-unittest.yml b/.github/workflows/superset-python-unittest.yml index 99b28cfb12e07..cf3e7c764118a 100644 --- a/.github/workflows/superset-python-unittest.yml +++ b/.github/workflows/superset-python-unittest.yml @@ -17,6 +17,9 @@ concurrency: jobs: unit-tests: runs-on: ubuntu-20.04 + strategy: + matrix: + python-version: ["current", "next"] env: PYTHONPATH: ${{ github.workspace }} steps: @@ -33,6 +36,8 @@ jobs: - name: Setup Python uses: ./.github/actions/setup-backend/ if: steps.check.outputs.python + with: + python-version: ${{ matrix.python-version }} - name: Python unit tests if: steps.check.outputs.python env: From 6bd770991e9c37f6f392d2a67ae9649516c93104 Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Wed, 10 Apr 2024 13:24:44 -0700 Subject: [PATCH 9/9] typo --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 5620ca3623ea5..14f02fb18ec43 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -76,7 +76,7 @@ github: - test-postgres-presto - test-sqlite - unit-tests (current) - - unit-tests (netxt) + - unit-tests (next) required_pull_request_reviews: dismiss_stale_reviews: false