Browse Source

Intermediate changes

robot-piglet 1 year ago
parent
commit
f8d4b4599b

+ 3 - 4
contrib/python/clickhouse-connect/.dist-info/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: clickhouse-connect
-Version: 0.6.23
+Version: 0.7.0
 Summary: ClickHouse Database Core Driver for Python, Pandas, and Superset
 Home-page: https://github.com/ClickHouse/clickhouse-connect
 Author: ClickHouse Inc.
@@ -10,12 +10,11 @@ Keywords: clickhouse,superset,sqlalchemy,http,driver
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Python: ~=3.7
+Requires-Python: ~=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: certifi
@@ -52,7 +51,7 @@ ClickHouse Connect currently uses the ClickHouse HTTP interface for maximum comp
 pip install clickhouse-connect
 ```
 
-ClickHouse Connect requires Python 3.7 or higher. 
+ClickHouse Connect requires Python 3.8 or higher. 
 
 
 ### Superset Connectivity

+ 1 - 1
contrib/python/clickhouse-connect/README.md

@@ -16,7 +16,7 @@ ClickHouse Connect currently uses the ClickHouse HTTP interface for maximum comp
 pip install clickhouse-connect
 ```
 
-ClickHouse Connect requires Python 3.7 or higher. 
+ClickHouse Connect requires Python 3.8 or higher. 
 
 
 ### Superset Connectivity

+ 1 - 1
contrib/python/clickhouse-connect/clickhouse_connect/__version__.py

@@ -1 +1 @@
-version = '0.6.23'
+version = '0.7.0'

+ 1 - 1
contrib/python/clickhouse-connect/clickhouse_connect/cc_sqlalchemy/inspector.py

@@ -40,7 +40,7 @@ class ChInspector(Inspector):
             raise NoResultFound(f'Table {full_table} does not exist')
         columns = []
         for row in result_set:
-            sqla_type = sqla_type_from_name(row.type)
+            sqla_type = sqla_type_from_name(row.type.replace('\n', ''))
             col = {'name': row.name,
                    'type': sqla_type,
                    'nullable': sqla_type.nullable,

+ 6 - 2
contrib/python/clickhouse-connect/clickhouse_connect/driver/httpclient.py

@@ -74,7 +74,7 @@ class HttpClient(Client):
         """
         self.url = f'{interface}://{host}:{port}'
         self.headers = {}
-        ch_settings = settings or {}
+        ch_settings = dict_copy(settings, self.params)
         self.http = pool_mgr
         if interface == 'https':
             if not https_proxy:
@@ -113,7 +113,11 @@ class HttpClient(Client):
         self._read_format = self._write_format = 'Native'
         self._transform = NativeTransform()
 
-        connect_timeout, send_receive_timeout = coerce_int(connect_timeout), coerce_int(send_receive_timeout)
+        # There is use cases when client need to disable timeouts.
+        if connect_timeout is not None:
+            connect_timeout = coerce_int(connect_timeout)
+        if send_receive_timeout is not None:
+            send_receive_timeout = coerce_int(send_receive_timeout)
         self.timeout = Timeout(connect=connect_timeout, read=send_receive_timeout)
         self.http_retries = 1
         self._send_progress = None

+ 5 - 1
contrib/python/clickhouse-connect/clickhouse_connect/driver/models.py

@@ -15,9 +15,13 @@ class ColumnDef(NamedTuple):
     codec_expression: str
     ttl_expression: str
 
+    @property
+    def type_name(self):
+        return self.type.replace('\n', '').strip()
+
     @property
     def ch_type(self):
-        return get_from_name(self.type)
+        return get_from_name(self.type_name)
 
 
 class SettingDef(NamedTuple):

+ 1 - 1
contrib/python/clickhouse-connect/ya.make

@@ -2,7 +2,7 @@
 
 PY3_LIBRARY()
 
-VERSION(0.6.23)
+VERSION(0.7.0)
 
 LICENSE(Apache-2.0)
 

+ 1 - 1
contrib/python/hypothesis/py3/.dist-info/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hypothesis
-Version: 6.96.2
+Version: 6.96.3
 Summary: A library for property-based testing
 Home-page: https://hypothesis.works
 Author: David R. MacIver and Zac Hatfield-Dodds

+ 1 - 1
contrib/python/hypothesis/py3/hypothesis/internal/observability.py

@@ -108,6 +108,6 @@ if (
 
     # Remove files more than a week old, to cap the size on disk
     max_age = (date.today() - timedelta(days=8)).isoformat()
-    for f in storage_directory("observed").glob("*.jsonl"):
+    for f in storage_directory("observed", intent_to_write=False).glob("*.jsonl"):
         if f.stem < max_age:  # pragma: no branch
             f.unlink(missing_ok=True)

+ 1 - 1
contrib/python/hypothesis/py3/hypothesis/version.py

@@ -8,5 +8,5 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-__version_info__ = (6, 96, 2)
+__version_info__ = (6, 96, 3)
 __version__ = ".".join(map(str, __version_info__))

Some files were not shown because too many files changed in this diff