From 94b0f34351ec07d3ad4c60d189483aac39416229 Mon Sep 17 00:00:00 2001 From: Andrey Bobelev Date: Tue, 30 Jan 2024 18:17:00 +0200 Subject: [PATCH 1/2] support Airflow 2.8.0 --- .github/workflows/tests.yml | 4 ++-- README.md | 1 + pyproject.toml | 4 ++-- requirements.txt | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e0a40a4..ad38d0f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ jobs: strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] - airflow-version: ["2.0.2", "2.1.4", "2.2.5", "2.3.4", "2.4.3", "2.5.3", "2.6.3", "2.7.1"] + airflow-version: ["2.0.2", "2.1.4", "2.2.5", "2.3.4", "2.4.3", "2.5.3", "2.6.3", "2.7.1", "2.8.1"] airflow-extras: ["", "[common.sql]"] exclude: # constraints files for these combinations are missing @@ -90,7 +90,7 @@ jobs: strategy: matrix: python-version: ["3.8", "3.9", "3.10", "3.11"] - airflow-version: ["2.0.2", "2.1.4", "2.2.5", "2.3.4", "2.4.3", "2.5.3", "2.6.3", "2.7.1"] + airflow-version: ["2.0.2", "2.1.4", "2.2.5", "2.3.4", "2.4.3", "2.5.3", "2.6.3", "2.7.1", "2.8.1"] airflow-extras: ["", "[common.sql]"] exclude: # constraints files for these combinations are missing diff --git a/README.md b/README.md index 517e1c8..495f900 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ Different versions of the plugin support different combinations of Python and Ai | airflow-clickhouse-plugin version | Airflow version | Python version | |-----------------------------------|-------------------------|--------------------| +| 1.2.0 | \>=2.0.0,<2.9.0 | ~=3.8 | | 1.1.0 | \>=2.0.0,<2.8.0 | ~=3.8 | | 1.0.0 | \>=2.0.0,<2.7.0 | ~=3.8 | | 0.11.0 | ~=2.0.0,\>=2.2.0,<2.7.0 | ~=3.7 | diff --git a/pyproject.toml b/pyproject.toml index 4a57f08..f4d9434 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" [project] name = "airflow-clickhouse-plugin" -version = "1.1.0" +version = "1.2.0" description = "airflow-clickhouse-plugin — Airflow plugin to execute ClickHouse commands and queries" readme = "README.md" requires-python = ">=3.8" @@ -39,7 +39,7 @@ Issues = "https://github.com/bryzgaloff/airflow-clickhouse-plugin/issues" [project.optional-dependencies] "common.sql" = [ - "apache-airflow[common.sql]>=2.2.0,<2.8.0", + "apache-airflow[common.sql]>=2.2.0,<2.9.0", "apache-airflow-providers-common-sql>=1.3.0", # introduces SQLExecuteQueryOperator "clickhouse-driver>=0.2.1", ] diff --git a/requirements.txt b/requirements.txt index d976c45..a78336d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ clickhouse-driver~=0.2.0 -apache-airflow>=2.0.0,<2.8.0 +apache-airflow>=2.0.0,<2.9.0 From 770df020a1b70d60cdcb0e19047cb596d0d52481 Mon Sep 17 00:00:00 2001 From: Andrey Bobelev Date: Tue, 30 Jan 2024 18:17:49 +0200 Subject: [PATCH 2/2] change clickhouse docker image yandex/clickhouse-server has been deprecated a while ago --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ad38d0f..c57e8a7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -131,7 +131,7 @@ jobs: tests-pattern: "-p test_clickhouse.py" services: clickhouse: - image: yandex/clickhouse-server + image: clickhouse/clickhouse-server ports: - 9000/tcp steps: