From 4e67cbb5ff3a44802c82b0de56270e2ba8e30658 Mon Sep 17 00:00:00 2001 From: Sebastian Liebscher <112352529+sebastianliebscher@users.noreply.github.com> Date: Mon, 1 May 2023 17:43:16 +0200 Subject: [PATCH 01/13] Update superset-python-integrationtest.yml --- .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 7b3da06283a2c..14a0a216e230e 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8, 3.9] + python-version: [3.8, 3.9, 3.10] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config From 9fafdf6950d83f7aa00111d4ff7a6b42e3bf5a72 Mon Sep 17 00:00:00 2001 From: Sebastian Liebscher <112352529+sebastianliebscher@users.noreply.github.com> Date: Mon, 1 May 2023 17:44:41 +0200 Subject: [PATCH 02/13] Update superset-python-unittest.yml --- .github/workflows/superset-python-unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/superset-python-unittest.yml b/.github/workflows/superset-python-unittest.yml index ad620d3227330..6993d0ea5a1c8 100644 --- a/.github/workflows/superset-python-unittest.yml +++ b/.github/workflows/superset-python-unittest.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8, 3.9] + python-version: [3.8, 3.9, 3.10] env: PYTHONPATH: ${{ github.workspace }} steps: From 58051babc05e3028ae30cd2e75dc5b560f4d4bda Mon Sep 17 00:00:00 2001 From: Sebastian Liebscher <112352529+sebastianliebscher@users.noreply.github.com> Date: Mon, 1 May 2023 17:59:40 +0200 Subject: [PATCH 03/13] Update superset-python-integrationtest.yml --- .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 14a0a216e230e..d3caeb00f8686 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8, 3.9, 3.10] + python-version: ["3.8", "3.9", "3.10"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config From 2a21a6dcc7a7855e60145bd37d9912e8bbac4891 Mon Sep 17 00:00:00 2001 From: Sebastian Liebscher <112352529+sebastianliebscher@users.noreply.github.com> Date: Mon, 1 May 2023 18:00:01 +0200 Subject: [PATCH 04/13] Update superset-python-unittest.yml --- .github/workflows/superset-python-unittest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/superset-python-unittest.yml b/.github/workflows/superset-python-unittest.yml index 6993d0ea5a1c8..ab599ce70aee0 100644 --- a/.github/workflows/superset-python-unittest.yml +++ b/.github/workflows/superset-python-unittest.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8, 3.9, 3.10] + python-version: ["3.8", "3.9", "3.10"] env: PYTHONPATH: ${{ github.workspace }} steps: From 7f2eaa76a6a7d68876e8f2a2b8edbc51eece5ee4 Mon Sep 17 00:00:00 2001 From: Sebastian Liebscher <112352529+sebastianliebscher@users.noreply.github.com> Date: Tue, 2 May 2023 02:48:55 +0200 Subject: [PATCH 05/13] python version doublequotes --- .github/workflows/superset-cli.yml | 2 +- .github/workflows/superset-python-integrationtest.yml | 4 ++-- .github/workflows/superset-python-misc.yml | 6 +++--- .github/workflows/superset-python-presto-hive.yml | 4 ++-- .github/workflows/superset-translations.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/superset-cli.yml b/.github/workflows/superset-cli.yml index 160c60965e5dc..129ecc117abce 100644 --- a/.github/workflows/superset-cli.yml +++ b/.github/workflows/superset-cli.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.9] + python-version: ["3.9"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml index d3caeb00f8686..7377458a15a7c 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ["3.8"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -147,7 +147,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ["3.8"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config diff --git a/.github/workflows/superset-python-misc.yml b/.github/workflows/superset-python-misc.yml index bb284a58ab2e7..1f37b08905462 100644 --- a/.github/workflows/superset-python-misc.yml +++ b/.github/workflows/superset-python-misc.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ["3.8"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v3 @@ -54,7 +54,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ["3.8"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v3 @@ -95,7 +95,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ["3.8"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v3 diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml index f817b32df03fb..c76950fe060ab 100644 --- a/.github/workflows/superset-python-presto-hive.yml +++ b/.github/workflows/superset-python-presto-hive.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ["3.8"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -91,7 +91,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ["3.8"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config diff --git a/.github/workflows/superset-translations.yml b/.github/workflows/superset-translations.yml index 65641a8b67f0c..5ae283d5ae543 100644 --- a/.github/workflows/superset-translations.yml +++ b/.github/workflows/superset-translations.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ["3.8"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v3 From 9852d9e53b8cb38d103273a86d7227104461c359 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Mon, 8 May 2023 21:27:06 +0300 Subject: [PATCH 06/13] Drop Py3.8 and use Py3.9 for all CI tests --- .github/workflows/superset-applitool-cypress.yml | 2 +- .github/workflows/superset-e2e.yml | 2 +- .github/workflows/superset-helm-lint.yml | 2 +- .github/workflows/superset-python-integrationtest.yml | 6 +++--- .github/workflows/superset-python-misc.yml | 6 +++--- .github/workflows/superset-python-presto-hive.yml | 4 ++-- .github/workflows/superset-python-unittest.yml | 2 +- .github/workflows/superset-translations.yml | 2 +- Dockerfile | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/superset-applitool-cypress.yml b/.github/workflows/superset-applitool-cypress.yml index 2647d7a0689a4..7222ed17d41c5 100644 --- a/.github/workflows/superset-applitool-cypress.yml +++ b/.github/workflows/superset-applitool-cypress.yml @@ -60,7 +60,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.9" - name: OS dependencies uses: ./.github/actions/cached-dependencies with: diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml index 3afdbe2cf3456..e1b090a5f3994 100644 --- a/.github/workflows/superset-e2e.yml +++ b/.github/workflows/superset-e2e.yml @@ -69,7 +69,7 @@ jobs: if: steps.check.outcome == 'failure' uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: "3.9" - name: OS dependencies if: steps.check.outcome == 'failure' uses: ./.github/actions/cached-dependencies diff --git a/.github/workflows/superset-helm-lint.yml b/.github/workflows/superset-helm-lint.yml index a0eca217969e3..4bb888e15d74e 100644 --- a/.github/workflows/superset-helm-lint.yml +++ b/.github/workflows/superset-helm-lint.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: 3.8 + python-version: "3.9" - 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 7377458a15a7c..40096c2eb8ec3 100644 --- a/.github/workflows/superset-python-integrationtest.yml +++ b/.github/workflows/superset-python-integrationtest.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -147,7 +147,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config diff --git a/.github/workflows/superset-python-misc.yml b/.github/workflows/superset-python-misc.yml index 1f37b08905462..400c217ed4262 100644 --- a/.github/workflows/superset-python-misc.yml +++ b/.github/workflows/superset-python-misc.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v3 @@ -54,7 +54,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v3 @@ -95,7 +95,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v3 diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml index c76950fe060ab..9349549848449 100644 --- a/.github/workflows/superset-python-presto-hive.yml +++ b/.github/workflows/superset-python-presto-hive.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] env: PYTHONPATH: ${{ github.workspace }} SUPERSET_CONFIG: tests.integration_tests.superset_test_config @@ -91,7 +91,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] 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 ab599ce70aee0..3fdc315b02642 100644 --- a/.github/workflows/superset-python-unittest.yml +++ b/.github/workflows/superset-python-unittest.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10"] env: PYTHONPATH: ${{ github.workspace }} steps: diff --git a/.github/workflows/superset-translations.yml b/.github/workflows/superset-translations.yml index 5ae283d5ae543..c903b9226940a 100644 --- a/.github/workflows/superset-translations.yml +++ b/.github/workflows/superset-translations.yml @@ -35,7 +35,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] steps: - name: "Checkout ${{ github.ref }} ( ${{ github.sha }} )" uses: actions/checkout@v3 diff --git a/Dockerfile b/Dockerfile index aa83ff5fdb9dc..0745294b45371 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ###################################################################### # Node stage to deal with static asset construction ###################################################################### -ARG PY_VER=3.8.16-slim +ARG PY_VER=3.9.16-slim # if BUILDPLATFORM is null, set it to 'amd64' (or leave as is otherwise). ARG BUILDPLATFORM=${BUILDPLATFORM:-amd64} From 089a4d92f8c643fbf135521e3749f5a41edac683 Mon Sep 17 00:00:00 2001 From: sebastianliebscher Date: Mon, 8 May 2023 21:02:54 +0200 Subject: [PATCH 07/13] silence mypy --- scripts/benchmark_migration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/benchmark_migration.py b/scripts/benchmark_migration.py index baae8befec1bc..25f0f3c283d5e 100644 --- a/scripts/benchmark_migration.py +++ b/scripts/benchmark_migration.py @@ -22,7 +22,7 @@ from inspect import getsource from pathlib import Path from types import ModuleType -from typing import Dict, List, Set, Type +from typing import Any, Dict, List, Set, Type import click from flask import current_app @@ -120,7 +120,7 @@ def find_models(module: ModuleType) -> List[Type[Model]]: # sort topologically so we can create entities in order and # maintain relationships (eg, create a database before creating # a slice) - sorter = TopologicalSorter() + sorter = TopologicalSorter() # type: TopologicalSorter[Any] for model in models: inspector = inspect(model) dependent_tables: List[str] = [] From e30a7d93a075e0355f443e3cf3dc128877d7de22 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 11:10:43 +0300 Subject: [PATCH 08/13] Remove graphlib-backport lib --- requirements/base.txt | 2 -- scripts/benchmark_migration.py | 2 +- setup.cfg | 2 +- setup.py | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 9a8b734e8d3ec..4d7877f8313e7 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -122,8 +122,6 @@ geographiclib==1.52 # via geopy geopy==2.2.0 # via apache-superset -graphlib-backport==1.0.3 - # via apache-superset gunicorn==20.1.0 # via apache-superset hashids==1.3.1 diff --git a/scripts/benchmark_migration.py b/scripts/benchmark_migration.py index 25f0f3c283d5e..dbc8a8bdedb72 100644 --- a/scripts/benchmark_migration.py +++ b/scripts/benchmark_migration.py @@ -19,6 +19,7 @@ import re import time from collections import defaultdict +from graphlib import TopologicalSorter from inspect import getsource from pathlib import Path from types import ModuleType @@ -28,7 +29,6 @@ from flask import current_app from flask_appbuilder import Model from flask_migrate import downgrade, upgrade -from graphlib import TopologicalSorter # pylint: disable=wrong-import-order from progress.bar import ChargingBar from sqlalchemy import create_engine, inspect from sqlalchemy.ext.automap import automap_base diff --git a/setup.cfg b/setup.cfg index 970fd4ca82465..41db2332abc08 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,7 +30,7 @@ combine_as_imports = true include_trailing_comma = true line_length = 88 known_first_party = superset -known_third_party =alembic,apispec,backoff,cachelib,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,graphlib,holidays,humanize,isodate,jinja2,jwt,markdown,markupsafe,marshmallow,marshmallow_enum,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,simplejson,slack,sqlalchemy,sqlalchemy_utils,sqlparse,typing_extensions,urllib3,werkzeug,wtforms,wtforms_json,yaml +known_third_party =alembic,apispec,backoff,cachelib,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,marshmallow_enum,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,simplejson,slack,sqlalchemy,sqlalchemy_utils,sqlparse,typing_extensions,urllib3,werkzeug,wtforms,wtforms_json,yaml multi_line_output = 3 order_by_type = false diff --git a/setup.py b/setup.py index 48991ed389ec0..ffccdfc474e87 100644 --- a/setup.py +++ b/setup.py @@ -92,7 +92,6 @@ def get_git_sha() -> str: "flask-wtf>=1.0.1, <1.1", "func_timeout", "geopy", - "graphlib-backport", "gunicorn>=20.1.0; sys_platform != 'win32'", "hashids>=1.3.1, <2", "holidays>=0.23, <0.24", From f21d19fd357e8f5283f360598a678d3d8cbcab0d Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 11:56:39 +0300 Subject: [PATCH 09/13] Removes Python 3.8 support --- Makefile | 6 +++--- UPDATING.md | 1 + docs/docs/contributing/local-backend.mdx | 2 +- setup.py | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fbe0fc8bfcb17..14e7bb17efdac 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,8 @@ # limitations under the License. # -# Python version installed; we need 3.8-3.11 -PYTHON=`command -v python3.11 || command -v python3.10 || command -v python3.9 || command -v python3.8` +# Python version installed; we need 3.9-3.11 +PYTHON=`command -v python3.11 || command -v python3.10 || command -v python3.9` .PHONY: install superset venv pre-commit @@ -70,7 +70,7 @@ update-js: venv: # Create a virtual environment and activate it (recommended) - if ! [ -x "${PYTHON}" ]; then echo "You need Python 3.8, 3.9, 3.10 or 3.11 installed"; exit 1; fi + if ! [ -x "${PYTHON}" ]; then echo "You need Python 3.9, 3.10 or 3.11 installed"; exit 1; fi test -d venv || ${PYTHON} -m venv venv # setup a python3 virtualenv . venv/bin/activate diff --git a/UPDATING.md b/UPDATING.md index 1d5f9385150ce..b001ffc467315 100644 --- a/UPDATING.md +++ b/UPDATING.md @@ -46,6 +46,7 @@ assists people when migrating to a new version. - [21163](https://github.com/apache/superset/pull/21163): The time grain will be decoupled from the time filter column and the time grain control will move below the X-Axis control when `GENERIC_CHART_AXES` feature flags set to `True`. The time grain will be applied on the time column in the column-like controls(x axis, dimensions) instead of the time column in the time section. - [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. +- [23890](https://github.com/apache/superset/pull/23890): Removes Python 3.8 support. ### Breaking Changes diff --git a/docs/docs/contributing/local-backend.mdx b/docs/docs/contributing/local-backend.mdx index 36d4586fe0ccb..5056f167369dc 100644 --- a/docs/docs/contributing/local-backend.mdx +++ b/docs/docs/contributing/local-backend.mdx @@ -12,7 +12,7 @@ version: 1 Make sure your machine meets the [OS dependencies](https://superset.apache.org/docs/installation/installing-superset-from-scratch#os-dependencies) before following these steps. You also need to install MySQL or [MariaDB](https://mariadb.com/downloads). -Ensure that you are using Python version 3.8 or 3.9, then proceed with: +Ensure that you are using Python version 3.9 or 3.10, then proceed with: ```bash # Create a virtual environment and activate it (recommended) diff --git a/setup.py b/setup.py index 6e81e37e9e849..bf182fbeaca33 100644 --- a/setup.py +++ b/setup.py @@ -185,13 +185,12 @@ def get_git_sha() -> str: "vertica": ["sqlalchemy-vertica-python>=0.5.9, < 0.6"], "netezza": ["nzalchemy>=11.0.2"], }, - python_requires="~=3.8", + python_requires="~=3.9", author="Apache Software Foundation", author_email="dev@superset.apache.org", url="https://superset.apache.org/", download_url="https://www.apache.org/dist/superset/" + version_string, classifiers=[ - "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", From 1f64472ad7179b88c2e3ef4f7030442cc2e9174b Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Tue, 9 May 2023 12:35:07 +0300 Subject: [PATCH 10/13] Update docker_build_push.sh --- .github/workflows/docker_build_push.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker_build_push.sh b/.github/workflows/docker_build_push.sh index b969813627c55..672ff84c33ae3 100755 --- a/.github/workflows/docker_build_push.sh +++ b/.github/workflows/docker_build_push.sh @@ -50,7 +50,7 @@ docker build --target lean \ -t "${REPO_NAME}:${SHA}" \ -t "${REPO_NAME}:${REFSPEC}" \ -t "${REPO_NAME}:${LATEST_TAG}" \ - --build-arg PY_VER="3.8-slim"\ + --build-arg PY_VER="3.9-slim"\ --label "sha=${SHA}" \ --label "built_at=$(date)" \ --label "target=lean" \ @@ -58,16 +58,16 @@ docker build --target lean \ . # -# Build the "lean39" image +# Build the "lean310" image # docker build --target lean \ - -t "${REPO_NAME}:${SHA}-py39" \ - -t "${REPO_NAME}:${REFSPEC}-py39" \ - -t "${REPO_NAME}:${LATEST_TAG}-py39" \ - --build-arg PY_VER="3.9-slim"\ + -t "${REPO_NAME}:${SHA}-py310" \ + -t "${REPO_NAME}:${REFSPEC}-py310" \ + -t "${REPO_NAME}:${LATEST_TAG}-py310" \ + --build-arg PY_VER="3.10-slim"\ --label "sha=${SHA}" \ --label "built_at=$(date)" \ - --label "target=lean39" \ + --label "target=lean310" \ --label "build_actor=${GITHUB_ACTOR}" \ . From 8a180aef8db5fc7b195f6cfeb24cbf7feb687d77 Mon Sep 17 00:00:00 2001 From: sebastianliebscher Date: Tue, 9 May 2023 15:49:54 +0200 Subject: [PATCH 11/13] use PY_VER from Dockerfile to build reproducible images --- .github/workflows/docker_build_push.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker_build_push.sh b/.github/workflows/docker_build_push.sh index 672ff84c33ae3..642b9b53db6de 100755 --- a/.github/workflows/docker_build_push.sh +++ b/.github/workflows/docker_build_push.sh @@ -50,7 +50,6 @@ docker build --target lean \ -t "${REPO_NAME}:${SHA}" \ -t "${REPO_NAME}:${REFSPEC}" \ -t "${REPO_NAME}:${LATEST_TAG}" \ - --build-arg PY_VER="3.9-slim"\ --label "sha=${SHA}" \ --label "built_at=$(date)" \ --label "target=lean" \ From f1e817cfef545985de1cffe0d7d54e308a379e79 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Wed, 10 May 2023 14:09:08 +0300 Subject: [PATCH 12/13] Refactor 'sorter' type --- scripts/benchmark_migration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/benchmark_migration.py b/scripts/benchmark_migration.py index dbc8a8bdedb72..83c06456a102b 100644 --- a/scripts/benchmark_migration.py +++ b/scripts/benchmark_migration.py @@ -120,7 +120,7 @@ def find_models(module: ModuleType) -> List[Type[Model]]: # sort topologically so we can create entities in order and # maintain relationships (eg, create a database before creating # a slice) - sorter = TopologicalSorter() # type: TopologicalSorter[Any] + sorter: TopologicalSorter[Any] = TopologicalSorter() for model in models: inspector = inspect(model) dependent_tables: List[str] = [] From 3b7e1f94f719dfb24649942ed3cdeac308b7fea2 Mon Sep 17 00:00:00 2001 From: EugeneTorap Date: Wed, 10 May 2023 19:15:41 +0300 Subject: [PATCH 13/13] Uncomment previous PY3.9 CI tests --- .asf.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index e9d16ae17e030..ab980e0c3fb2b 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -66,12 +66,12 @@ github: - cypress-matrix (3, chrome) - docker-build - frontend-build -# - pre-commit (3.9) -# - python-lint (3.9) -# - test-mysql (3.9) -# - test-postgres (3.9) -# - test-postgres (3.10) -# - test-sqlite (3.9) + - pre-commit (3.9) + - python-lint (3.9) + - test-mysql (3.9) + - test-postgres (3.9) + - test-postgres (3.10) + - test-sqlite (3.9) required_pull_request_reviews: dismiss_stale_reviews: false