diff --git a/clickhouse/setup.py b/clickhouse/setup.py index 004a151c7..ec8c48a7d 100644 --- a/clickhouse/setup.py +++ b/clickhouse/setup.py @@ -12,6 +12,7 @@ url="https://github.com/testcontainers/testcontainers-python", install_requires=[ "testcontainers-core", + "clickhouse-connect", "clickhouse-driver", ], python_requires=">=3.7", diff --git a/clickhouse/testcontainers/clickhouse/__init__.py b/clickhouse/testcontainers/clickhouse/__init__.py index b78c509cd..d78b6bda2 100644 --- a/clickhouse/testcontainers/clickhouse/__init__.py +++ b/clickhouse/testcontainers/clickhouse/__init__.py @@ -13,8 +13,10 @@ import os from typing import Optional +import clickhouse_connect +from clickhouse_connect.driver.exceptions import Error as ClickhouseConnectError import clickhouse_driver -from clickhouse_driver.errors import Error +from clickhouse_driver.errors import Error as ClickhouseDriverError from testcontainers.core.generic import DbContainer from testcontainers.core.utils import raise_for_deprecated_parameter @@ -23,38 +25,62 @@ class ClickHouseContainer(DbContainer): """ - ClickHouse database container. + ClickHouse database container. This testcontainer defaults to exposing the TCP port of + ClickHouse. If you want to use the HTTP interface, specify port 8123 to be exposed. Example: - The example spins up a ClickHouse database and connects to it using the - :code:`clickhouse-driver`. + This example shows how to spin up ClickHouse. + It demonstrates how to connect to the *TCP* interface using :code:`clickhouse-driver` + and how to connect to the *HTTP* interface using :code:`clickhouse-connect`, the + official client library. .. doctest:: - >>> import clickhouse_driver >>> from testcontainers.clickhouse import ClickHouseContainer - >>> with ClickHouseContainer("clickhouse/clickhouse-server:21.8") as clickhouse: + >>> # clickhouse_driver is a client lib that uses the TCP interface + >>> import clickhouse_driver + >>> # ClickHouseContainer exports the TCP port by default + >>> with ClickHouseContainer(image="clickhouse/clickhouse-server:21.8") as clickhouse: ... client = clickhouse_driver.Client.from_url(clickhouse.get_connection_url()) ... client.execute("select 'working'") [('working',)] + + >>> # clickhouse_connect is the official client lib, based on the HTTP interface + >>> import clickhouse_connect + >>> # If you want to use the HTTP interface, port 8123 needs to be exposed + >>> with ClickHouseContainer(port=8123) as clickhouse: + ... client = clickhouse_connect.get_client(dsn=clickhouse.get_connection_url()) + ... client.query("select 'working'").result_rows + [('working',)] """ - def __init__(self, image: str = "clickhouse/clickhouse-server:latest", port: int = 9000, - username: Optional[str] = None, password: Optional[str] = None, - dbname: Optional[str] = None, **kwargs) -> None: + + def __init__( + self, + image: str = "clickhouse/clickhouse-server:latest", + port: int = 9000, + username: Optional[str] = None, + password: Optional[str] = None, + dbname: Optional[str] = None, + **kwargs + ) -> None: raise_for_deprecated_parameter(kwargs, "user", "username") super().__init__(image=image, **kwargs) - self.username = username or os.environ.get("CLICKHOUSE_USER", "test") - self.password = password or os.environ.get("CLICKHOUSE_PASSWORD", "test") - self.dbname = dbname or os.environ.get("CLICKHOUSE_DB", "test") + self.username: str = username or os.environ.get("CLICKHOUSE_USER", "test") + self.password: str = password or os.environ.get("CLICKHOUSE_PASSWORD", "test") + self.dbname: str = dbname or os.environ.get("CLICKHOUSE_DB", "test") self.port = port self.with_exposed_ports(self.port) - @wait_container_is_ready(Error, EOFError) + @wait_container_is_ready(ClickhouseDriverError, ClickhouseConnectError, EOFError) def _connect(self) -> None: - with clickhouse_driver.Client.from_url(self.get_connection_url()) as client: - client.execute("SELECT version()") + if self.port == 8123: + with clickhouse_connect.get_client(dsn=self.get_connection_url()) as client: + client.command("SELECT version()") + else: + with clickhouse_driver.Client.from_url(self.get_connection_url()) as client: + client.execute("SELECT version()") def _configure(self) -> None: self.with_env("CLICKHOUSE_USER", self.username) diff --git a/clickhouse/tests/test_clickhouse.py b/clickhouse/tests/test_clickhouse.py index 32ac046f7..a63c44ecc 100644 --- a/clickhouse/tests/test_clickhouse.py +++ b/clickhouse/tests/test_clickhouse.py @@ -1,11 +1,17 @@ +import clickhouse_connect import clickhouse_driver from testcontainers.clickhouse import ClickHouseContainer -def test_docker_run_clickhouse(): - clickhouse_container = ClickHouseContainer() - with clickhouse_container as clickhouse: +def test_clickhouse_tcp_interface(): + with ClickHouseContainer() as clickhouse: client = clickhouse_driver.Client.from_url(clickhouse.get_connection_url()) result = client.execute("select 'working'") + assert result == [("working",)] - assert result == [('working',)] + +def test_clickhouse_http_interface(): + with ClickHouseContainer(port=8123) as clickhouse: + client = clickhouse_connect.get_client(dsn=clickhouse.get_connection_url()) + result = client.query("select 'working'").result_rows + assert result == [("working",)] diff --git a/requirements/macos-latest-3.10.txt b/requirements/macos-latest-3.10.txt index 429a054fd..5df98b6c2 100644 --- a/requirements/macos-latest-3.10.txt +++ b/requirements/macos-latest-3.10.txt @@ -96,16 +96,17 @@ bcrypt==4.0.1 # via paramiko bleach==6.0.0 # via readme-renderer -boto3==1.26.129 +boto3==1.26.130 # via testcontainers-localstack -botocore==1.29.129 +botocore==1.29.130 # via # boto3 # s3transfer cachetools==5.3.0 # via google-auth -certifi==2022.12.7 +certifi==2023.5.7 # via + # clickhouse-connect # minio # opensearch-py # requests @@ -116,6 +117,8 @@ cffi==1.15.1 # pynacl charset-normalizer==3.1.0 # via requests +clickhouse-connect==0.5.23 + # via testcontainers-clickhouse clickhouse-driver==0.2.6 # via testcontainers-clickhouse coverage[toml]==7.2.5 @@ -133,7 +136,7 @@ distro==1.8.0 # via docker-compose dnspython==2.3.0 # via pymongo -docker[ssh]==6.1.0 +docker[ssh]==6.1.1 # via # docker-compose # testcontainers-core @@ -214,6 +217,8 @@ kafka-python==2.0.2 # via testcontainers-kafka keyring==23.13.1 # via twine +lz4==4.3.2 + # via clickhouse-connect markdown-it-py==2.2.0 # via rich markupsafe==2.1.2 @@ -250,7 +255,7 @@ pluggy==1.0.0 # via pytest proto-plus==1.22.2 # via google-cloud-pubsub -protobuf==4.22.4 +protobuf==4.23.0 # via # google-api-core # google-cloud-pubsub @@ -309,10 +314,11 @@ python-dotenv==0.21.1 # via docker-compose python-jose==3.3.0 # via python-keycloak -python-keycloak==2.16.1 +python-keycloak==2.16.2 # via testcontainers-keycloak pytz==2023.3 # via + # clickhouse-connect # clickhouse-driver # neo4j pytz-deprecation-shim==0.1.0.post0 @@ -321,7 +327,7 @@ pyyaml==5.4.1 # via docker-compose readme-renderer==37.3 # via twine -redis==4.5.4 +redis==4.5.5 # via testcontainers-redis requests==2.30.0 # via @@ -335,7 +341,7 @@ requests==2.30.0 # requests-toolbelt # sphinx # twine -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via # python-arango # python-keycloak @@ -352,7 +358,7 @@ s3transfer==0.6.1 # via boto3 scramp==1.4.4 # via pg8000 -selenium==4.9.0 +selenium==4.9.1 # via testcontainers-selenium six==1.16.0 # via @@ -418,6 +424,7 @@ tzlocal==4.3 urllib3[socks]==1.26.15 # via # botocore + # clickhouse-connect # docker # minio # opensearch-py @@ -440,6 +447,8 @@ wsproto==1.2.0 # via trio-websocket zipp==3.15.0 # via importlib-metadata +zstandard==0.21.0 + # via clickhouse-connect # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/ubuntu-latest-3.10.txt b/requirements/ubuntu-latest-3.10.txt index ce6573279..f12474b49 100644 --- a/requirements/ubuntu-latest-3.10.txt +++ b/requirements/ubuntu-latest-3.10.txt @@ -96,16 +96,17 @@ bcrypt==4.0.1 # via paramiko bleach==6.0.0 # via readme-renderer -boto3==1.26.129 +boto3==1.26.130 # via testcontainers-localstack -botocore==1.29.129 +botocore==1.29.130 # via # boto3 # s3transfer cachetools==5.3.0 # via google-auth -certifi==2022.12.7 +certifi==2023.5.7 # via + # clickhouse-connect # minio # opensearch-py # requests @@ -116,6 +117,8 @@ cffi==1.15.1 # pynacl charset-normalizer==3.1.0 # via requests +clickhouse-connect==0.5.23 + # via testcontainers-clickhouse clickhouse-driver==0.2.6 # via testcontainers-clickhouse coverage[toml]==7.2.5 @@ -134,7 +137,7 @@ distro==1.8.0 # via docker-compose dnspython==2.3.0 # via pymongo -docker[ssh]==6.1.0 +docker[ssh]==6.1.1 # via # docker-compose # testcontainers-core @@ -219,6 +222,8 @@ kafka-python==2.0.2 # via testcontainers-kafka keyring==23.13.1 # via twine +lz4==4.3.2 + # via clickhouse-connect markdown-it-py==2.2.0 # via rich markupsafe==2.1.2 @@ -255,7 +260,7 @@ pluggy==1.0.0 # via pytest proto-plus==1.22.2 # via google-cloud-pubsub -protobuf==4.22.4 +protobuf==4.23.0 # via # google-api-core # google-cloud-pubsub @@ -314,10 +319,11 @@ python-dotenv==0.21.1 # via docker-compose python-jose==3.3.0 # via python-keycloak -python-keycloak==2.16.1 +python-keycloak==2.16.2 # via testcontainers-keycloak pytz==2023.3 # via + # clickhouse-connect # clickhouse-driver # neo4j pytz-deprecation-shim==0.1.0.post0 @@ -326,7 +332,7 @@ pyyaml==5.4.1 # via docker-compose readme-renderer==37.3 # via twine -redis==4.5.4 +redis==4.5.5 # via testcontainers-redis requests==2.30.0 # via @@ -340,7 +346,7 @@ requests==2.30.0 # requests-toolbelt # sphinx # twine -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via # python-arango # python-keycloak @@ -359,7 +365,7 @@ scramp==1.4.4 # via pg8000 secretstorage==3.3.3 # via keyring -selenium==4.9.0 +selenium==4.9.1 # via testcontainers-selenium six==1.16.0 # via @@ -425,6 +431,7 @@ tzlocal==4.3 urllib3[socks]==1.26.15 # via # botocore + # clickhouse-connect # docker # minio # opensearch-py @@ -447,6 +454,8 @@ wsproto==1.2.0 # via trio-websocket zipp==3.15.0 # via importlib-metadata +zstandard==0.21.0 + # via clickhouse-connect # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/ubuntu-latest-3.11.txt b/requirements/ubuntu-latest-3.11.txt index cac9cd549..ccc57b85f 100644 --- a/requirements/ubuntu-latest-3.11.txt +++ b/requirements/ubuntu-latest-3.11.txt @@ -79,8 +79,6 @@ asn1crypto==1.5.1 # via scramp async-generator==1.10 # via trio -async-timeout==4.0.2 - # via redis attrs==23.1.0 # via # jsonschema @@ -96,16 +94,17 @@ bcrypt==4.0.1 # via paramiko bleach==6.0.0 # via readme-renderer -boto3==1.26.129 +boto3==1.26.130 # via testcontainers-localstack -botocore==1.29.129 +botocore==1.29.130 # via # boto3 # s3transfer cachetools==5.3.0 # via google-auth -certifi==2022.12.7 +certifi==2023.5.7 # via + # clickhouse-connect # minio # opensearch-py # requests @@ -116,6 +115,8 @@ cffi==1.15.1 # pynacl charset-normalizer==3.1.0 # via requests +clickhouse-connect==0.5.23 + # via testcontainers-clickhouse clickhouse-driver==0.2.6 # via testcontainers-clickhouse coverage[toml]==7.2.5 @@ -134,7 +135,7 @@ distro==1.8.0 # via docker-compose dnspython==2.3.0 # via pymongo -docker[ssh]==6.1.0 +docker[ssh]==6.1.1 # via # docker-compose # testcontainers-core @@ -216,6 +217,8 @@ kafka-python==2.0.2 # via testcontainers-kafka keyring==23.13.1 # via twine +lz4==4.3.2 + # via clickhouse-connect markdown-it-py==2.2.0 # via rich markupsafe==2.1.2 @@ -252,7 +255,7 @@ pluggy==1.0.0 # via pytest proto-plus==1.22.2 # via google-cloud-pubsub -protobuf==4.22.4 +protobuf==4.23.0 # via # google-api-core # google-cloud-pubsub @@ -311,10 +314,11 @@ python-dotenv==0.21.1 # via docker-compose python-jose==3.3.0 # via python-keycloak -python-keycloak==2.16.1 +python-keycloak==2.16.2 # via testcontainers-keycloak pytz==2023.3 # via + # clickhouse-connect # clickhouse-driver # neo4j pytz-deprecation-shim==0.1.0.post0 @@ -323,7 +327,7 @@ pyyaml==5.4.1 # via docker-compose readme-renderer==37.3 # via twine -redis==4.5.4 +redis==4.5.5 # via testcontainers-redis requests==2.30.0 # via @@ -337,7 +341,7 @@ requests==2.30.0 # requests-toolbelt # sphinx # twine -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via # python-arango # python-keycloak @@ -356,7 +360,7 @@ scramp==1.4.4 # via pg8000 secretstorage==3.3.3 # via keyring -selenium==4.9.0 +selenium==4.9.1 # via testcontainers-selenium six==1.16.0 # via @@ -418,6 +422,7 @@ tzlocal==4.3 urllib3[socks]==1.26.15 # via # botocore + # clickhouse-connect # docker # minio # opensearch-py @@ -440,6 +445,8 @@ wsproto==1.2.0 # via trio-websocket zipp==3.15.0 # via importlib-metadata +zstandard==0.21.0 + # via clickhouse-connect # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/ubuntu-latest-3.7.txt b/requirements/ubuntu-latest-3.7.txt index fbe67cf4f..48d7cf203 100644 --- a/requirements/ubuntu-latest-3.7.txt +++ b/requirements/ubuntu-latest-3.7.txt @@ -100,9 +100,9 @@ bcrypt==4.0.1 # via paramiko bleach==6.0.0 # via readme-renderer -boto3==1.26.129 +boto3==1.26.130 # via testcontainers-localstack -botocore==1.29.129 +botocore==1.29.130 # via # boto3 # s3transfer @@ -110,8 +110,9 @@ cached-property==1.5.2 # via docker-compose cachetools==5.3.0 # via google-auth -certifi==2022.12.7 +certifi==2023.5.7 # via + # clickhouse-connect # minio # opensearch-py # requests @@ -122,6 +123,8 @@ cffi==1.15.1 # pynacl charset-normalizer==3.1.0 # via requests +clickhouse-connect==0.5.23 + # via testcontainers-clickhouse clickhouse-driver==0.2.6 # via testcontainers-clickhouse coverage[toml]==7.2.5 @@ -140,7 +143,7 @@ distro==1.8.0 # via docker-compose dnspython==2.3.0 # via pymongo -docker[ssh]==6.1.0 +docker[ssh]==6.1.1 # via # docker-compose # testcontainers-core @@ -236,6 +239,8 @@ kafka-python==2.0.2 # via testcontainers-kafka keyring==23.13.1 # via twine +lz4==4.3.2 + # via clickhouse-connect markdown-it-py==2.2.0 # via rich markupsafe==2.1.2 @@ -272,7 +277,7 @@ pluggy==1.0.0 # via pytest proto-plus==1.22.2 # via google-cloud-pubsub -protobuf==4.22.4 +protobuf==4.23.0 # via # google-api-core # google-cloud-pubsub @@ -331,11 +336,12 @@ python-dotenv==0.21.1 # via docker-compose python-jose==3.3.0 # via python-keycloak -python-keycloak==2.16.1 +python-keycloak==2.16.2 # via testcontainers-keycloak pytz==2023.3 # via # babel + # clickhouse-connect # clickhouse-driver # neo4j pytz-deprecation-shim==0.1.0.post0 @@ -344,7 +350,7 @@ pyyaml==5.4.1 # via docker-compose readme-renderer==37.3 # via twine -redis==4.5.4 +redis==4.5.5 # via testcontainers-redis requests==2.30.0 # via @@ -358,7 +364,7 @@ requests==2.30.0 # requests-toolbelt # sphinx # twine -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via # python-arango # python-keycloak @@ -377,7 +383,7 @@ scramp==1.4.4 # via pg8000 secretstorage==3.3.3 # via keyring -selenium==4.9.0 +selenium==4.9.1 # via testcontainers-selenium six==1.16.0 # via @@ -449,6 +455,7 @@ tzlocal==4.3 urllib3[socks]==1.26.15 # via # botocore + # clickhouse-connect # docker # minio # opensearch-py @@ -473,6 +480,8 @@ zipp==3.15.0 # via # importlib-metadata # importlib-resources +zstandard==0.21.0 + # via clickhouse-connect # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/ubuntu-latest-3.8.txt b/requirements/ubuntu-latest-3.8.txt index 70a86aa02..597098505 100644 --- a/requirements/ubuntu-latest-3.8.txt +++ b/requirements/ubuntu-latest-3.8.txt @@ -100,16 +100,17 @@ bcrypt==4.0.1 # via paramiko bleach==6.0.0 # via readme-renderer -boto3==1.26.129 +boto3==1.26.130 # via testcontainers-localstack -botocore==1.29.129 +botocore==1.29.130 # via # boto3 # s3transfer cachetools==5.3.0 # via google-auth -certifi==2022.12.7 +certifi==2023.5.7 # via + # clickhouse-connect # minio # opensearch-py # requests @@ -120,6 +121,8 @@ cffi==1.15.1 # pynacl charset-normalizer==3.1.0 # via requests +clickhouse-connect==0.5.23 + # via testcontainers-clickhouse clickhouse-driver==0.2.6 # via testcontainers-clickhouse coverage[toml]==7.2.5 @@ -138,7 +141,7 @@ distro==1.8.0 # via docker-compose dnspython==2.3.0 # via pymongo -docker[ssh]==6.1.0 +docker[ssh]==6.1.1 # via # docker-compose # testcontainers-core @@ -226,6 +229,8 @@ kafka-python==2.0.2 # via testcontainers-kafka keyring==23.13.1 # via twine +lz4==4.3.2 + # via clickhouse-connect markdown-it-py==2.2.0 # via rich markupsafe==2.1.2 @@ -262,7 +267,7 @@ pluggy==1.0.0 # via pytest proto-plus==1.22.2 # via google-cloud-pubsub -protobuf==4.22.4 +protobuf==4.23.0 # via # google-api-core # google-cloud-pubsub @@ -321,11 +326,12 @@ python-dotenv==0.21.1 # via docker-compose python-jose==3.3.0 # via python-keycloak -python-keycloak==2.16.1 +python-keycloak==2.16.2 # via testcontainers-keycloak pytz==2023.3 # via # babel + # clickhouse-connect # clickhouse-driver # neo4j pytz-deprecation-shim==0.1.0.post0 @@ -334,7 +340,7 @@ pyyaml==5.4.1 # via docker-compose readme-renderer==37.3 # via twine -redis==4.5.4 +redis==4.5.5 # via testcontainers-redis requests==2.30.0 # via @@ -348,7 +354,7 @@ requests==2.30.0 # requests-toolbelt # sphinx # twine -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via # python-arango # python-keycloak @@ -367,7 +373,7 @@ scramp==1.4.4 # via pg8000 secretstorage==3.3.3 # via keyring -selenium==4.9.0 +selenium==4.9.1 # via testcontainers-selenium six==1.16.0 # via @@ -434,6 +440,7 @@ tzlocal==4.3 urllib3[socks]==1.26.15 # via # botocore + # clickhouse-connect # docker # minio # opensearch-py @@ -458,6 +465,8 @@ zipp==3.15.0 # via # importlib-metadata # importlib-resources +zstandard==0.21.0 + # via clickhouse-connect # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/ubuntu-latest-3.9.txt b/requirements/ubuntu-latest-3.9.txt index a1e4dd7fa..c9e86eee6 100644 --- a/requirements/ubuntu-latest-3.9.txt +++ b/requirements/ubuntu-latest-3.9.txt @@ -96,16 +96,17 @@ bcrypt==4.0.1 # via paramiko bleach==6.0.0 # via readme-renderer -boto3==1.26.129 +boto3==1.26.130 # via testcontainers-localstack -botocore==1.29.129 +botocore==1.29.130 # via # boto3 # s3transfer cachetools==5.3.0 # via google-auth -certifi==2022.12.7 +certifi==2023.5.7 # via + # clickhouse-connect # minio # opensearch-py # requests @@ -116,6 +117,8 @@ cffi==1.15.1 # pynacl charset-normalizer==3.1.0 # via requests +clickhouse-connect==0.5.23 + # via testcontainers-clickhouse clickhouse-driver==0.2.6 # via testcontainers-clickhouse coverage[toml]==7.2.5 @@ -134,7 +137,7 @@ distro==1.8.0 # via docker-compose dnspython==2.3.0 # via pymongo -docker[ssh]==6.1.0 +docker[ssh]==6.1.1 # via # docker-compose # testcontainers-core @@ -220,6 +223,8 @@ kafka-python==2.0.2 # via testcontainers-kafka keyring==23.13.1 # via twine +lz4==4.3.2 + # via clickhouse-connect markdown-it-py==2.2.0 # via rich markupsafe==2.1.2 @@ -256,7 +261,7 @@ pluggy==1.0.0 # via pytest proto-plus==1.22.2 # via google-cloud-pubsub -protobuf==4.22.4 +protobuf==4.23.0 # via # google-api-core # google-cloud-pubsub @@ -315,10 +320,11 @@ python-dotenv==0.21.1 # via docker-compose python-jose==3.3.0 # via python-keycloak -python-keycloak==2.16.1 +python-keycloak==2.16.2 # via testcontainers-keycloak pytz==2023.3 # via + # clickhouse-connect # clickhouse-driver # neo4j pytz-deprecation-shim==0.1.0.post0 @@ -327,7 +333,7 @@ pyyaml==5.4.1 # via docker-compose readme-renderer==37.3 # via twine -redis==4.5.4 +redis==4.5.5 # via testcontainers-redis requests==2.30.0 # via @@ -341,7 +347,7 @@ requests==2.30.0 # requests-toolbelt # sphinx # twine -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via # python-arango # python-keycloak @@ -360,7 +366,7 @@ scramp==1.4.4 # via pg8000 secretstorage==3.3.3 # via keyring -selenium==4.9.0 +selenium==4.9.1 # via testcontainers-selenium six==1.16.0 # via @@ -426,6 +432,7 @@ tzlocal==4.3 urllib3[socks]==1.26.15 # via # botocore + # clickhouse-connect # docker # minio # opensearch-py @@ -448,6 +455,8 @@ wsproto==1.2.0 # via trio-websocket zipp==3.15.0 # via importlib-metadata +zstandard==0.21.0 + # via clickhouse-connect # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements/windows-latest-3.10.txt b/requirements/windows-latest-3.10.txt index c567ecf4c..183cb6326 100644 --- a/requirements/windows-latest-3.10.txt +++ b/requirements/windows-latest-3.10.txt @@ -96,16 +96,17 @@ bcrypt==4.0.1 # via paramiko bleach==6.0.0 # via readme-renderer -boto3==1.26.129 +boto3==1.26.130 # via testcontainers-localstack -botocore==1.29.129 +botocore==1.29.130 # via # boto3 # s3transfer cachetools==5.3.0 # via google-auth -certifi==2022.12.7 +certifi==2023.5.7 # via + # clickhouse-connect # minio # opensearch-py # requests @@ -117,6 +118,8 @@ cffi==1.15.1 # trio charset-normalizer==3.1.0 # via requests +clickhouse-connect==0.5.23 + # via testcontainers-clickhouse clickhouse-driver==0.2.6 # via testcontainers-clickhouse colorama==0.4.6 @@ -139,7 +142,7 @@ distro==1.8.0 # via docker-compose dnspython==2.3.0 # via pymongo -docker[ssh]==6.1.0 +docker[ssh]==6.1.1 # via # docker-compose # testcontainers-core @@ -220,6 +223,8 @@ kafka-python==2.0.2 # via testcontainers-kafka keyring==23.13.1 # via twine +lz4==4.3.2 + # via clickhouse-connect markdown-it-py==2.2.0 # via rich markupsafe==2.1.2 @@ -256,7 +261,7 @@ pluggy==1.0.0 # via pytest proto-plus==1.22.2 # via google-cloud-pubsub -protobuf==4.22.4 +protobuf==4.23.0 # via # google-api-core # google-cloud-pubsub @@ -315,10 +320,11 @@ python-dotenv==0.21.1 # via docker-compose python-jose==3.3.0 # via python-keycloak -python-keycloak==2.16.1 +python-keycloak==2.16.2 # via testcontainers-keycloak pytz==2023.3 # via + # clickhouse-connect # clickhouse-driver # neo4j pytz-deprecation-shim==0.1.0.post0 @@ -331,7 +337,7 @@ pyyaml==5.4.1 # via docker-compose readme-renderer==37.3 # via twine -redis==4.5.4 +redis==4.5.5 # via testcontainers-redis requests==2.30.0 # via @@ -345,7 +351,7 @@ requests==2.30.0 # requests-toolbelt # sphinx # twine -requests-toolbelt==0.10.1 +requests-toolbelt==1.0.0 # via # python-arango # python-keycloak @@ -362,7 +368,7 @@ s3transfer==0.6.1 # via boto3 scramp==1.4.4 # via pg8000 -selenium==4.9.0 +selenium==4.9.1 # via testcontainers-selenium six==1.16.0 # via @@ -430,6 +436,7 @@ tzlocal==4.3 urllib3[socks]==1.26.15 # via # botocore + # clickhouse-connect # docker # minio # opensearch-py @@ -452,6 +459,8 @@ wsproto==1.2.0 # via trio-websocket zipp==3.15.0 # via importlib-metadata +zstandard==0.21.0 + # via clickhouse-connect # The following packages are considered to be unsafe in a requirements file: # setuptools