You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2022/03/24 22:31:12 UTC
[airflow] branch main updated: Remove back 3.6 to unblock PRs (#22516)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new e3a68e2 Remove back 3.6 to unblock PRs (#22516)
e3a68e2 is described below
commit e3a68e2b49f7b4a7539de8e4871f5ca2e3079b69
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Thu Mar 24 23:29:29 2022 +0100
Remove back 3.6 to unblock PRs (#22516)
---
.github/workflows/build-images.yml | 4 ----
dev/breeze/src/airflow_breeze/global_constants.py | 4 ++--
dev/breeze/tests/test_cache.py | 4 ++--
scripts/ci/libraries/_initialization.sh | 2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 282f92d..e23b363 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -166,8 +166,6 @@ jobs:
needs: [build-info]
strategy:
matrix:
- # We need to attempt to build all possible versions here because pull_request_target
- # event is run for both main and v1-10-tests
python-version: ${{ fromJson(needs.build-info.outputs.allPythonVersions) }}
fail-fast: true
if: needs.build-info.outputs.image-build == 'true'
@@ -254,8 +252,6 @@ jobs:
needs: [build-info, build-ci-images]
strategy:
matrix:
- # We need to attempt to build all possible versions here because pull_request_target
- # event is run for both main and v1-10-tests
python-version: ${{ fromJson(needs.build-info.outputs.allPythonVersions) }}
fail-fast: true
if: needs.build-info.outputs.image-build == 'true'
diff --git a/dev/breeze/src/airflow_breeze/global_constants.py b/dev/breeze/src/airflow_breeze/global_constants.py
index 86cc407..d6cb55b 100644
--- a/dev/breeze/src/airflow_breeze/global_constants.py
+++ b/dev/breeze/src/airflow_breeze/global_constants.py
@@ -32,7 +32,7 @@ DEFAULT_PYTHON_MAJOR_MINOR_VERSION = '3.7'
DEFAULT_BACKEND = 'sqlite'
# Checked before putting in build cache
-ALLOWED_PYTHON_MAJOR_MINOR_VERSIONS = ['3.7', '3.8', '3.9', '3.10', '3.6']
+ALLOWED_PYTHON_MAJOR_MINOR_VERSIONS = ['3.7', '3.8', '3.9', '3.10']
ALLOWED_BACKENDS = ['sqlite', 'mysql', 'postgres', 'mssql']
ALLOWED_STATIC_CHECKS = [
"all",
@@ -213,7 +213,7 @@ SQLITE_URL = "sqlite:////root/airflow/airflow.db"
PYTHONDONTWRITEBYTECODE = True
PRODUCTION_IMAGE = False
-ALL_PYTHON_MAJOR_MINOR_VERSIONS = ['3.6', '3.7', '3.8', '3.9', '3.10']
+ALL_PYTHON_MAJOR_MINOR_VERSIONS = ['3.7', '3.8', '3.9', '3.10']
CURRENT_PYTHON_MAJOR_MINOR_VERSIONS = ['3.7', '3.8', '3.9', '3.10']
CURRENT_POSTGRES_VERSIONS = ['10', '11', '12', '13']
CURRENT_MYSQL_VERSIONS = ['5.7', '8']
diff --git a/dev/breeze/tests/test_cache.py b/dev/breeze/tests/test_cache.py
index 087747e..64bd623 100644
--- a/dev/breeze/tests/test_cache.py
+++ b/dev/breeze/tests/test_cache.py
@@ -35,8 +35,8 @@ AIRFLOW_SOURCES = Path(__file__).parent.parent.parent.parent
[
("backend", "mysql", (True, ['sqlite', 'mysql', 'postgres', 'mssql']), None),
("backend", "xxx", (False, ['sqlite', 'mysql', 'postgres', 'mssql']), None),
- ("python_major_minor_version", "3.8", (True, ['3.7', '3.8', '3.9', '3.10', "3.6"]), None),
- ("python_major_minor_version", "3.5", (False, ['3.7', '3.8', '3.9', '3.10', "3.6"]), None),
+ ("python_major_minor_version", "3.8", (True, ['3.7', '3.8', '3.9', '3.10']), None),
+ ("python_major_minor_version", "3.5", (False, ['3.7', '3.8', '3.9', '3.10']), None),
("missing", "value", None, AttributeError),
],
)
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 69224ac..397749b 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -117,7 +117,7 @@ function initialization::initialize_base_variables() {
export PRODUCTION_IMAGE="false"
# All supported major/minor versions of python in all versions of Airflow
- ALL_PYTHON_MAJOR_MINOR_VERSIONS+=("3.6" "3.7" "3.8" "3.9" "3.10")
+ ALL_PYTHON_MAJOR_MINOR_VERSIONS+=("3.7" "3.8" "3.9" "3.10")
export ALL_PYTHON_MAJOR_MINOR_VERSIONS
# Currently supported major/minor versions of python