Release 1 7 5 (#265)

* Release 1.7.5 housekeeping

* Upgrade setuptools requirement for clickhouse_driver install

* Remove flake8 checks for the moment

* Update workflow actions

* Fix black comma

.github/workflows/lint.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Setup Python 3.9
-        uses: actions/setup-python@v4
+      - name: Setup Python 3.11
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       - name: Upgrade Setuptools
         run: pip install --upgrade setuptools wheel

.github/workflows/pypi.yml

@@ -16,12 +16,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Upgrade Setuptools
         run: pip install --upgrade setuptools wheel

.github/workflows/test_cloud.yml

@@ -21,10 +21,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python 3.11
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 

.github/workflows/test_matrix.yml

@@ -26,16 +26,17 @@ jobs:
           - '3.9'
           - '3.10'
           - '3.11'
+          - '3.12'
         clickhouse-version:
-          - '23.3'
           - '23.8'
-          - '23.9'
-          - '23.10'
+          - '24.1'
+          - '24.2'
+          - '24.3'
           - latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set environment variables
         if: ${{ matrix.clickhouse-version == '22.3' }}
@@ -49,7 +50,7 @@ jobs:
         run: REPLICA_NUM=1 docker-compose -f ${{ github.workspace }}/tests/integration/docker-compose.yml up -d
 
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 

CHANGELOG.md

@@ -1,3 +1,9 @@
+### Release [1.7.5], 2024-04-02
+#### Bug Fixes
+- Requirements and tests upgraded to include Python 3.12.  Closes https://github.com/ClickHouse/dbt-clickhouse/issues/264
+- Model settings were not working correctly for customer materializations.  Thanks to original dbt-clickhouse [silentsokolov](https://github.com/silentsokolov)
+for the PR!
+
 ### Release [1.7.4], 2024-03-23
 #### Improvement
 - Adds support for materializing ClickHouse dictionaries.  Thanks to [Rory Sawyer](https://github.com/SoryRawyer) for the contribution!

Makefile

@@ -1,5 +1,5 @@
 # Check style and linting
-.PHONY: check-black check-isort check-flake8 check-mypy lint
+.PHONY: check-black check-isort check-mypy lint
 
 check-black:
 	@echo "--> Running black checks"
@@ -9,10 +9,6 @@ check-isort:
 	@echo "--> Running isort checks"
 	@isort --check-only .
 
-check-flake8:
-	@echo "--> Running flake8 checks"
-	@flake8 .
-
 check-mypy:
 	@echo "--> Running mypy checks"
 	@mypy --exclude dbt/adapters/clickhouse/__init__.py --exclude conftest.py .
@@ -21,7 +17,7 @@ check-yamllint:
 	@echo "--> Running yamllint checks"
 	@yamllint dbt tests .github 
 
-lint: check-black check-isort check-flake8 check-mypy check-yamllint
+lint: check-black check-isort check-mypy check-yamllint
 
 # Format code
 .PHONY: fmt

dbt/adapters/clickhouse/__version__.py

@@ -1 +1 @@
-version = '1.7.4'
+version = '1.7.5'

dbt/adapters/clickhouse/dbclient.py

@@ -53,20 +53,20 @@ def get_db_client(credentials: ClickHouseCredentials):
             from dbt.adapters.clickhouse.nativeclient import ChNativeClient
 
             return ChNativeClient(credentials)
-        except ImportError:
+        except ImportError as ex:
             raise FailedToConnectError(
                 'Native adapter required but package clickhouse-driver is not installed'
-            )
+            ) from ex
     try:
         import clickhouse_connect  # noqa
 
         from dbt.adapters.clickhouse.httpclient import ChHttpClient
 
         return ChHttpClient(credentials)
-    except ImportError:
+    except ImportError as ex:
         raise FailedToConnectError(
             'HTTP adapter required but package clickhouse-connect is not installed'
-        )
+        ) from ex
 
 
 class ChRetryableException(Exception):

dev_requirements.txt

@@ -1,16 +1,15 @@
-dbt-core~=1.7.3
-clickhouse-connect>=0.6.22
-clickhouse-driver>=0.2.6
+dbt-core~=1.7.11
+clickhouse-connect>=0.7.6
+clickhouse-driver>=0.2.7
 pytest>=7.2.0
 pytest-dotenv==0.5.2
-dbt-tests-adapter~=1.7.3
+dbt-tests-adapter~=1.7.11
 black==24.3.0
 isort==5.10.1
 mypy==0.991
 yamllint==1.26.3
-flake8==4.0.1
 types-requests==2.27.29
 agate~=1.7.1
 requests~=2.27.1
-setuptools~=65.3.0
-types-setuptools==67.1.0.0
+setuptools>=69.2.0
+types-setuptools>=69.2.0

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.black]
 line-length = 100
 skip-string-normalization = true
-target-version = ['py310', 'py311']
+target-version = ['py310', 'py311', 'py312']
 exclude = '(\.eggs|\.git|\.mypy_cache|\.venv|venv|env|_build|build|build|dist|)'
 
 [tool.isort]

setup.py

@@ -57,6 +57,7 @@ def _dbt_clickhouse_version():
         f'dbt-core~={dbt_version}',
         'clickhouse-connect>=0.6.22',
         'clickhouse-driver>=0.2.6',
+        'setuptools>=0.69',
     ],
     python_requires=">=3.8",
     platforms='any',