Skip to content

Commit

Permalink
Upgrade setuptools requirement for clickhouse_driver install
Browse files Browse the repository at this point in the history
  • Loading branch information
genzgd committed Apr 2, 2024
1 parent 908ab2d commit deabd1c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dbt/adapters/clickhouse/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = '1.7.4'
version = '1.7.5'
8 changes: 4 additions & 4 deletions dbt/adapters/clickhouse/dbclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions dev_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ 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
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down

0 comments on commit deabd1c

Please sign in to comment.