From 661314dcc33b45f701fdb009c7fe9b7e86fd4b6e Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 10:31:03 +0800 Subject: [PATCH 1/9] update --- nebula3/Config.py | 12 +- nebula3/fbthrift/transport/THttp2Client.py | 85 ++++++ nebula3/gclient/net/Connection.py | 76 ++++- nebula3/gclient/net/ConnectionPool.py | 20 +- nebula3/gclient/net/SessionPool.py | 25 +- pdm.lock | 336 ++++++++++++++++++++- pyproject.toml | 1 + setup.py | 1 + tests/secrets/client.crt | 30 +- tests/secrets/client.csr | 26 +- tests/secrets/client.key | 50 +-- tests/secrets/root..cnf | 21 -- tests/secrets/root..crt | 16 - tests/secrets/root..csr | 16 - tests/secrets/root..key | 27 -- tests/secrets/root.crt | 34 +-- tests/secrets/root.csr | 26 +- tests/secrets/root.key | 50 +-- tests/secrets/root.srl | 2 +- tests/secrets/server.cnf | 1 + tests/secrets/server.crt | 30 +- tests/secrets/server.csr | 30 +- tests/secrets/server.key | 50 +-- 23 files changed, 698 insertions(+), 267 deletions(-) create mode 100644 nebula3/fbthrift/transport/THttp2Client.py delete mode 100644 tests/secrets/root..cnf delete mode 100644 tests/secrets/root..crt delete mode 100644 tests/secrets/root..csr delete mode 100644 tests/secrets/root..key diff --git a/nebula3/Config.py b/nebula3/Config.py index 55e9d09a..272970e0 100644 --- a/nebula3/Config.py +++ b/nebula3/Config.py @@ -12,18 +12,18 @@ class Config(object): # the min connection always in pool min_connection_pool_size = 0 - # the max connection in pool max_connection_pool_size = 10 - # connection or execute timeout, unit ms, 0 means no timeout timeout = 0 - # 0 means will never close the idle connection, unit ms, idle_time = 0 - # the interval to check idle time connection, unit second, -1 means no check interval_check = -1 + # use http2 or not + use_http2 = False + # headers for http2, dict type + http_headers = None class SSL_config(object): @@ -89,3 +89,7 @@ class SessionPoolConfig(object): max_size = 30 min_size = 1 interval_check = -1 + # use http2 or not + use_http2 = False + # headers for http2, dict type + http_headers = None diff --git a/nebula3/fbthrift/transport/THttp2Client.py b/nebula3/fbthrift/transport/THttp2Client.py new file mode 100644 index 00000000..fe98dad8 --- /dev/null +++ b/nebula3/fbthrift/transport/THttp2Client.py @@ -0,0 +1,85 @@ +# Copyright (c) 2024 vesoft inc. All rights reserved. +# +# This source code is licensed under Apache 2.0 License. +# +from nebula3.fbthrift.transport.TTransport import * +import httpx + +default_timeout = 60 + +class THttp2Client(TTransportBase): + def __init__(self, url, + timeout=None, + verify=None, + certfile=None, + keyfile=None, + password=None, + http_headers=None, + ): + self.__wbuf = StringIO() + self.__rbuf = StringIO() + self.__http = None + if timeout is not None and timeout > 0 : + self.timeout = timeout + if timeout is None: + self.timeout = default_timeout + + self.url = url + if verify is None: + self.verify = False + else: + self.verify = verify + if certfile is not None : + self.cert = (certfile, keyfile, password) + else: + self.cert = None + self.response = None + self.http_headers = http_headers + + def isOpen(self): + return self.__http is not None and self.__http.is_closed is False + + def open(self): + if self.cert is None: + self.__http = httpx.Client(http1=False,http2=True, verify=False, timeout=self.timeout) + else: + self.__http = httpx.Client(http1=False,http2=True, verify=self.verify, cert=self.cert, timeout=self.timeout) + + def close(self): + self.__http.close() + self.__http = None + + def read(self, sz): + return self.__rbuf.read(sz) + + + def write(self, buf): + self.__wbuf.write(buf) + + def flush(self): + if self.isOpen(): + self.close() + self.open() + + # Pull data out of buffer + data = self.__wbuf.getvalue() + self.__wbuf = StringIO() + + # HTTP2 request + header = { + 'Content-Type': 'application/x-thrift', + 'Content-Length': str(len(data)), + 'User-Agent': 'Python/THttpClient', + } + if self.http_headers is not None and isinstance(self.http_headers, dict): + header.update(self.http_headers) + try: + self.response= self.__http.post(self.url, headers=header, data=data) + except Exception as e: + raise TTransportException(TTransportException.UNKNOWN, str(e)) + # Get reply to flush the request + self.code = self.response.status_code + self.headers = self.response.headers + self.__rbuf = StringIO() + self.__rbuf.write(self.response.read()) + self.__rbuf.seek(0) diff --git a/nebula3/gclient/net/Connection.py b/nebula3/gclient/net/Connection.py index d51efaac..b4a306de 100644 --- a/nebula3/gclient/net/Connection.py +++ b/nebula3/gclient/net/Connection.py @@ -6,15 +6,17 @@ import time +import ssl from nebula3.fbthrift.transport import ( TSocket, TSSLSocket, TTransport, THeaderTransport, + THttp2Client, ) from nebula3.fbthrift.transport.TTransport import TTransportException -from nebula3.fbthrift.protocol import THeaderProtocol +from nebula3.fbthrift.protocol import THeaderProtocol, TBinaryProtocol from nebula3.common.ttypes import ErrorCode from nebula3.graph import GraphService @@ -42,30 +44,54 @@ def __init__(self): self._port = None self._timeout = 0 self._ssl_conf = None + self.use_http2 = False + self.http_headers = None - def open(self, ip, port, timeout): + def open(self, ip, port, timeout, use_http2=False, http_headers=None): """open the connection :param ip: the server ip :param port: the server port :param timeout: the timeout for connect and execute + :param use_http2: use http2 or not + :param http_headers: http headers :return: void """ - self.open_SSL(ip, port, timeout, None) + self.open_SSL(ip, port, timeout, None, use_http2, http_headers) - def open_SSL(self, ip, port, timeout, ssl_config=None): + def open_SSL( + self, ip, port, timeout, ssl_config=None, use_http2=False, http_headers=None + ): """open the SSL connection :param ip: the server ip :param port: the server port :param timeout: the timeout for connect and execute :ssl_config: configs for SSL + :param use_http2: use http2 or not + :param http_headers: http headers :return: void """ self._ip = ip self._port = port self._timeout = timeout self._ssl_conf = ssl_config + self.use_http2 = use_http2 + self.http_headers = http_headers + try: + if use_http2 is False: + protocol = self.__get_protocol(timeout, ssl_config) + else: + protocol = self.__get_protocal_http2(timeout, ssl_config, http_headers) + self._connection = GraphService.Client(protocol) + resp = self._connection.verifyClientVersion(VerifyClientVersionReq()) + if resp.error_code != ErrorCode.SUCCEEDED: + self._connection._iprot.trans.close() + raise ClientServerIncompatibleException(resp.error_msg) + except Exception as e: + raise + + def __get_protocol(self, timeout, ssl_config): try: if ssl_config is not None: s = TSSLSocket.TSSLSocket( @@ -89,14 +115,29 @@ def open_SSL(self, ip, port, timeout, ssl_config=None): header_transport = THeaderTransport.THeaderTransport(buffered_transport) protocol = THeaderProtocol.THeaderProtocol(header_transport) header_transport.open() - - self._connection = GraphService.Client(protocol) - resp = self._connection.verifyClientVersion(VerifyClientVersionReq()) - if resp.error_code != ErrorCode.SUCCEEDED: - self._connection._iprot.trans.close() - raise ClientServerIncompatibleException(resp.error_msg) - except Exception: + except Exception as e: + raise + return protocol + + def __get_protocal_http2(self, timeout, ssl_config, http_headers): + verify, certfile, keyfile, password = None, None, None, None + if ssl_config is not None: + # verify could be a boolean or ssl.SSLContext in httpx. + verify = ssl.create_default_context(cafile=ssl_config.ca_certs) + certfile = ssl_config.certfile + keyfile = ssl_config.keyfile + url = "https://" + self._ip + ":" + str(self._port) + else: + url = "http://" + self._ip + ":" + str(self._port) + try: + transport = THttp2Client.THttp2Client( + url, timeout, verify, certfile, keyfile, password, http_headers + ) + transport.open() + protocol = TBinaryProtocol.TBinaryProtocol(transport) + except Exception as e: raise + return protocol def _reopen(self): """reopen the connection @@ -105,9 +146,18 @@ def _reopen(self): """ self.close() if self._ssl_conf is not None: - self.open_SSL(self._ip, self._port, self._timeout, self._ssl_conf) + self.open_SSL( + self._ip, + self._port, + self._timeout, + self._ssl_conf, + self.use_http2, + self.http_headers, + ) else: - self.open(self._ip, self._port, self._timeout) + self.open( + self._ip, self._port, self._timeout, self.use_http2, self.http_headers + ) def authenticate(self, user_name, password): """authenticate to graphd diff --git a/nebula3/gclient/net/ConnectionPool.py b/nebula3/gclient/net/ConnectionPool.py index 5617f270..134e4be7 100644 --- a/nebula3/gclient/net/ConnectionPool.py +++ b/nebula3/gclient/net/ConnectionPool.py @@ -15,6 +15,7 @@ from nebula3.gclient.net.Session import Session from nebula3.gclient.net.Connection import Connection +from nebula3.Config import Config from nebula3.logger import logger @@ -51,6 +52,7 @@ def init(self, addresses, configs, ssl_conf=None): if self._close: logger.error('The pool has init or closed.') raise RuntimeError('The pool has init or closed.') + assert isinstance(configs, Config) self._configs = configs self._ssl_configs = ssl_conf for address in addresses: @@ -82,7 +84,12 @@ def init(self, addresses, configs, ssl_conf=None): for i in range(0, conns_per_address): connection = Connection() connection.open_SSL( - addr[0], addr[1], self._configs.timeout, self._ssl_configs + addr[0], + addr[1], + self._configs.timeout, + self._ssl_configs, + self._configs.use_http2, + self._configs.http_headers, ) self._connections[addr].append(connection) return True @@ -181,6 +188,8 @@ def get_connection(self): addr[1], self._configs.timeout, self._ssl_configs, + self._configs.use_http2, + self._configs.http_headers, ) connection.is_used = True self._connections[addr].append(connection) @@ -206,7 +215,14 @@ def ping(self, address): """ try: conn = Connection() - conn.open_SSL(address[0], address[1], 1000, self._ssl_configs) + conn.open_SSL( + address[0], + address[1], + 1000, + self._ssl_configs, + self._configs.use_http2, + self._configs.http_headers, + ) conn.close() return True except Exception as ex: diff --git a/nebula3/gclient/net/SessionPool.py b/nebula3/gclient/net/SessionPool.py index 1be6b3c1..652f7334 100644 --- a/nebula3/gclient/net/SessionPool.py +++ b/nebula3/gclient/net/SessionPool.py @@ -123,9 +123,22 @@ def ping(self, address): try: conn = Connection() if self._ssl_configs is None: - conn.open(address[0], address[1], 1000) + conn.open( + address[0], + address[1], + 1000, + self._configs.use_http2, + self._configs.http_headers, + ) else: - conn.open_SSL(address[0], address[1], 1000, self._ssl_configs) + conn.open_SSL( + address[0], + address[1], + 1000, + self._ssl_configs, + self._configs.use_http2, + self._configs.http_headers, + ) conn.close() return True except Exception as ex: @@ -381,7 +394,13 @@ def _new_session(self): # connect to the valid service connection = Connection() try: - connection.open(addr[0], addr[1], self._configs.timeout) + connection.open( + addr[0], + addr[1], + self._configs.timeout, + self._configs.use_http2, + self._configs.http_headers, + ) auth_result = connection.authenticate(self._username, self._password) session = Session(connection, auth_result, self, False) diff --git a/pdm.lock b/pdm.lock index 00bb74cc..a3ef7fa1 100644 --- a/pdm.lock +++ b/pdm.lock @@ -5,7 +5,34 @@ groups = ["default", "dev", "test", "example"] strategy = ["cross_platform"] lock_version = "4.4.1" -content_hash = "sha256:4c67ae2c2756f542b0cc795389b8c47b5b0fa0c28014bdcd7edfe5d272d28d1c" +content_hash = "sha256:194e39977eafc628667e17a2497510327d22c64a26f6ccb84141c07015f3e76a" + +[[package]] +name = "anyio" +version = "3.6.2" +requires_python = ">=3.6.2" +summary = "High level compatibility layer for multiple asynchronous event loop implementations" +dependencies = [ + "contextvars; python_version < \"3.7\"", + "dataclasses; python_version < \"3.7\"", + "idna>=2.8", + "sniffio>=1.1", + "typing-extensions; python_version < \"3.8\"", +] +files = [ + {file = "anyio-3.6.2-py3-none-any.whl", hash = "sha256:fbbe32bd270d2a2ef3ed1c5d45041250284e31fc0a4df4a5a6071842051a51e3"}, + {file = "anyio-3.6.2.tar.gz", hash = "sha256:25ea0d673ae30af41a0c442f81cf3b38c7e79fdc7b60335a4c14e05eb0947421"}, +] + +[[package]] +name = "async-generator" +version = "1.10" +requires_python = ">=3.5" +summary = "Async generators and context managers for Python 3.5+" +files = [ + {file = "async_generator-1.10-py3-none-any.whl", hash = "sha256:01c7bf666359b4967d2cda0000cc2e4af16a0ae098cbffcb8472fb9e8ad6585b"}, + {file = "async_generator-1.10.tar.gz", hash = "sha256:6ebb3d106c12920aaae42ccb6f787ef5eefdcdd166ea3d628fa8476abe712144"}, +] [[package]] name = "black" @@ -48,6 +75,111 @@ files = [ {file = "black-22.8.0.tar.gz", hash = "sha256:792f7eb540ba9a17e8656538701d3eb1afcb134e3b45b71f20b25c77a8db7e6e"}, ] +[[package]] +name = "certifi" +version = "2024.2.2" +requires_python = ">=3.6" +summary = "Python package for providing Mozilla's CA Bundle." +files = [ + {file = "certifi-2024.2.2-py3-none-any.whl", hash = "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1"}, + {file = "certifi-2024.2.2.tar.gz", hash = "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f"}, +] + +[[package]] +name = "charset-normalizer" +version = "3.0.1" +summary = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." +files = [ + {file = "charset-normalizer-3.0.1.tar.gz", hash = "sha256:ebea339af930f8ca5d7a699b921106c6e29c617fe9606fa7baa043c1cdae326f"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:88600c72ef7587fe1708fd242b385b6ed4b8904976d5da0893e31df8b3480cb6"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c75ffc45f25324e68ab238cb4b5c0a38cd1c3d7f1fb1f72b5541de469e2247db"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:db72b07027db150f468fbada4d85b3b2729a3db39178abf5c543b784c1254539"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:62595ab75873d50d57323a91dd03e6966eb79c41fa834b7a1661ed043b2d404d"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ff6f3db31555657f3163b15a6b7c6938d08df7adbfc9dd13d9d19edad678f1e8"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:772b87914ff1152b92a197ef4ea40efe27a378606c39446ded52c8f80f79702e"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70990b9c51340e4044cfc394a81f614f3f90d41397104d226f21e66de668730d"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:292d5e8ba896bbfd6334b096e34bffb56161c81408d6d036a7dfa6929cff8783"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2edb64ee7bf1ed524a1da60cdcd2e1f6e2b4f66ef7c077680739f1641f62f555"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:31a9ddf4718d10ae04d9b18801bd776693487cbb57d74cc3458a7673f6f34639"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:44ba614de5361b3e5278e1241fda3dc1838deed864b50a10d7ce92983797fa76"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:12db3b2c533c23ab812c2b25934f60383361f8a376ae272665f8e48b88e8e1c6"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c512accbd6ff0270939b9ac214b84fb5ada5f0409c44298361b2f5e13f9aed9e"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-win32.whl", hash = "sha256:502218f52498a36d6bf5ea77081844017bf7982cdbe521ad85e64cabee1b608b"}, + {file = "charset_normalizer-3.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:601f36512f9e28f029d9481bdaf8e89e5148ac5d89cffd3b05cd533eeb423b59"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0298eafff88c99982a4cf66ba2efa1128e4ddaca0b05eec4c456bbc7db691d8d"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:a8d0fc946c784ff7f7c3742310cc8a57c5c6dc31631269876a88b809dbeff3d3"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:87701167f2a5c930b403e9756fab1d31d4d4da52856143b609e30a1ce7160f3c"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:14e76c0f23218b8f46c4d87018ca2e441535aed3632ca134b10239dfb6dadd6b"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0c0a590235ccd933d9892c627dec5bc7511ce6ad6c1011fdf5b11363022746c1"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8c7fe7afa480e3e82eed58e0ca89f751cd14d767638e2550c77a92a9e749c317"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:79909e27e8e4fcc9db4addea88aa63f6423ebb171db091fb4373e3312cb6d603"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8ac7b6a045b814cf0c47f3623d21ebd88b3e8cf216a14790b455ea7ff0135d18"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:72966d1b297c741541ca8cf1223ff262a6febe52481af742036a0b296e35fa5a"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:f9d0c5c045a3ca9bedfc35dca8526798eb91a07aa7a2c0fee134c6c6f321cbd7"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:5995f0164fa7df59db4746112fec3f49c461dd6b31b841873443bdb077c13cfc"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:4a8fcf28c05c1f6d7e177a9a46a1c52798bfe2ad80681d275b10dcf317deaf0b"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:761e8904c07ad053d285670f36dd94e1b6ab7f16ce62b9805c475b7aa1cffde6"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-win32.whl", hash = "sha256:71140351489970dfe5e60fc621ada3e0f41104a5eddaca47a7acb3c1b851d6d3"}, + {file = "charset_normalizer-3.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:9ab77acb98eba3fd2a85cd160851816bfce6871d944d885febf012713f06659c"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:84c3990934bae40ea69a82034912ffe5a62c60bbf6ec5bc9691419641d7d5c9a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:74292fc76c905c0ef095fe11e188a32ebd03bc38f3f3e9bcb85e4e6db177b7ea"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c95a03c79bbe30eec3ec2b7f076074f4281526724c8685a42872974ef4d36b72"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4c39b0e3eac288fedc2b43055cfc2ca7a60362d0e5e87a637beac5d801ef478"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df2c707231459e8a4028eabcd3cfc827befd635b3ef72eada84ab13b52e1574d"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93ad6d87ac18e2a90b0fe89df7c65263b9a99a0eb98f0a3d2e079f12a0735837"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:59e5686dd847347e55dffcc191a96622f016bc0ad89105e24c14e0d6305acbc6"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:cd6056167405314a4dc3c173943f11249fa0f1b204f8b51ed4bde1a9cd1834dc"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:083c8d17153ecb403e5e1eb76a7ef4babfc2c48d58899c98fcaa04833e7a2f9a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:f5057856d21e7586765171eac8b9fc3f7d44ef39425f85dbcccb13b3ebea806c"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:7eb33a30d75562222b64f569c642ff3dc6689e09adda43a082208397f016c39a"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-win32.whl", hash = "sha256:95dea361dd73757c6f1c0a1480ac499952c16ac83f7f5f4f84f0658a01b8ef41"}, + {file = "charset_normalizer-3.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:eaa379fcd227ca235d04152ca6704c7cb55564116f8bc52545ff357628e10602"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3e45867f1f2ab0711d60c6c71746ac53537f1684baa699f4f668d4c6f6ce8e14"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cadaeaba78750d58d3cc6ac4d1fd867da6fc73c88156b7a3212a3cd4819d679d"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:911d8a40b2bef5b8bbae2e36a0b103f142ac53557ab421dc16ac4aafee6f53dc"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:503e65837c71b875ecdd733877d852adbc465bd82c768a067badd953bf1bc5a3"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a60332922359f920193b1d4826953c507a877b523b2395ad7bc716ddd386d866"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:16a8663d6e281208d78806dbe14ee9903715361cf81f6d4309944e4d1e59ac5b"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a16418ecf1329f71df119e8a65f3aa68004a3f9383821edcb20f0702934d8087"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:9d9153257a3f70d5f69edf2325357251ed20f772b12e593f3b3377b5f78e7ef8"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:02a51034802cbf38db3f89c66fb5d2ec57e6fe7ef2f4a44d070a593c3688667b"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:2e396d70bc4ef5325b72b593a72c8979999aa52fb8bcf03f701c1b03e1166918"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:11b53acf2411c3b09e6af37e4b9005cba376c872503c8f28218c7243582df45d"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-win32.whl", hash = "sha256:0bf2dae5291758b6f84cf923bfaa285632816007db0330002fa1de38bfcb7154"}, + {file = "charset_normalizer-3.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:2c03cc56021a4bd59be889c2b9257dae13bf55041a3372d3295416f86b295fb5"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:024e606be3ed92216e2b6952ed859d86b4cfa52cd5bc5f050e7dc28f9b43ec42"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4b0d02d7102dd0f997580b51edc4cebcf2ab6397a7edf89f1c73b586c614272c"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:358a7c4cb8ba9b46c453b1dd8d9e431452d5249072e4f56cfda3149f6ab1405e"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81d6741ab457d14fdedc215516665050f3822d3e56508921cc7239f8c8e66a58"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8b8af03d2e37866d023ad0ddea594edefc31e827fee64f8de5611a1dbc373174"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9cf4e8ad252f7c38dd1f676b46514f92dc0ebeb0db5552f5f403509705e24753"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e696f0dd336161fca9adbb846875d40752e6eba585843c768935ba5c9960722b"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c22d3fe05ce11d3671297dc8973267daa0f938b93ec716e12e0f6dee81591dc1"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:109487860ef6a328f3eec66f2bf78b0b72400280d8f8ea05f69c51644ba6521a"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:37f8febc8ec50c14f3ec9637505f28e58d4f66752207ea177c1d67df25da5aed"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:f97e83fa6c25693c7a35de154681fcc257c1c41b38beb0304b9c4d2d9e164479"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:a152f5f33d64a6be73f1d30c9cc82dfc73cec6477ec268e7c6e4c7d23c2d2291"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:39049da0ffb96c8cbb65cbf5c5f3ca3168990adf3551bd1dee10c48fce8ae820"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-win32.whl", hash = "sha256:4457ea6774b5611f4bed5eaa5df55f70abde42364d498c5134b7ef4c6958e20e"}, + {file = "charset_normalizer-3.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:e62164b50f84e20601c1ff8eb55620d2ad25fb81b59e3cd776a1902527a788af"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:8eade758719add78ec36dc13201483f8e9b5d940329285edcd5f70c0a9edbd7f"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8499ca8f4502af841f68135133d8258f7b32a53a1d594aa98cc52013fff55678"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3fc1c4a2ffd64890aebdb3f97e1278b0cc72579a08ca4de8cd2c04799a3a22be"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:00d3ffdaafe92a5dc603cb9bd5111aaa36dfa187c8285c543be562e61b755f6b"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c2ac1b08635a8cd4e0cbeaf6f5e922085908d48eb05d44c5ae9eabab148512ca"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f6f45710b4459401609ebebdbcfb34515da4fc2aa886f95107f556ac69a9147e"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ae1de54a77dc0d6d5fcf623290af4266412a7c4be0b1ff7444394f03f5c54e3"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3b590df687e3c5ee0deef9fc8c547d81986d9a1b56073d82de008744452d6541"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:ab5de034a886f616a5668aa5d098af2b5385ed70142090e2a31bcbd0af0fdb3d"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9cb3032517f1627cc012dbc80a8ec976ae76d93ea2b5feaa9d2a5b8882597579"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:608862a7bf6957f2333fc54ab4399e405baad0163dc9f8d99cb236816db169d4"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:0f438ae3532723fb6ead77e7c604be7c8374094ef4ee2c5e03a3a17f1fca256c"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:356541bf4381fa35856dafa6a965916e54bed415ad8a24ee6de6e37deccf2786"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-win32.whl", hash = "sha256:39cf9ed17fe3b1bc81f33c9ceb6ce67683ee7526e65fde1447c772afc54a1bb8"}, + {file = "charset_normalizer-3.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:0a11e971ed097d24c534c037d298ad32c6ce81a45736d31e0ff0ad37ab437d59"}, + {file = "charset_normalizer-3.0.1-py3-none-any.whl", hash = "sha256:7e189e2e1d3ed2f4aebabd2d5b0f931e883676e51c7624826e0a4e5fe8a0bf24"}, +] + [[package]] name = "click" version = "8.0.4" @@ -72,6 +204,17 @@ files = [ {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, ] +[[package]] +name = "contextvars" +version = "2.4" +summary = "PEP 567 Backport" +dependencies = [ + "immutables>=0.9", +] +files = [ + {file = "contextvars-2.4.tar.gz", hash = "sha256:f38c908aaa59c14335eeea12abea5f443646216c4e29380d7bf34d2018e2c39e"}, +] + [[package]] name = "coverage" version = "7.2.7" @@ -243,6 +386,56 @@ files = [ {file = "future-1.0.0.tar.gz", hash = "sha256:bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05"}, ] +[[package]] +name = "h11" +version = "0.12.0" +requires_python = ">=3.6" +summary = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +files = [ + {file = "h11-0.12.0-py3-none-any.whl", hash = "sha256:36a3cb8c0a032f56e2da7084577878a035d3b61d104230d4bd49c0c6b555a9c6"}, + {file = "h11-0.12.0.tar.gz", hash = "sha256:47222cb6067e4a307d535814917cd98fd0a57b6788ce715755fa2b6c28b56042"}, +] + +[[package]] +name = "h2" +version = "4.1.0" +requires_python = ">=3.6.1" +summary = "HTTP/2 State-Machine based protocol implementation" +dependencies = [ + "hpack<5,>=4.0", + "hyperframe<7,>=6.0", +] +files = [ + {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, + {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, +] + +[[package]] +name = "hpack" +version = "4.0.0" +requires_python = ">=3.6.1" +summary = "Pure-Python HPACK header compression" +files = [ + {file = "hpack-4.0.0-py3-none-any.whl", hash = "sha256:84a076fad3dc9a9f8063ccb8041ef100867b1878b25ef0ee63847a5d53818a6c"}, + {file = "hpack-4.0.0.tar.gz", hash = "sha256:fc41de0c63e687ebffde81187a948221294896f6bdc0ae2312708df339430095"}, +] + +[[package]] +name = "httpcore" +version = "0.14.7" +requires_python = ">=3.6" +summary = "A minimal low-level HTTP client." +dependencies = [ + "anyio==3.*", + "certifi", + "h11<0.13,>=0.11", + "sniffio==1.*", +] +files = [ + {file = "httpcore-0.14.7-py3-none-any.whl", hash = "sha256:47d772f754359e56dd9d892d9593b6f9870a37aeb8ba51e9a88b09b3d68cfade"}, + {file = "httpcore-0.14.7.tar.gz", hash = "sha256:7503ec1c0f559066e7e39bc4003fd2ce023d01cf51793e3c173b864eb456ead1"}, +] + [[package]] name = "httplib2" version = "0.22.0" @@ -256,6 +449,111 @@ files = [ {file = "httplib2-0.22.0.tar.gz", hash = "sha256:d7a10bc5ef5ab08322488bde8c726eeee5c8618723fdb399597ec58f3d82df81"}, ] +[[package]] +name = "httpx" +version = "0.22.0" +requires_python = ">=3.6" +summary = "The next generation HTTP client." +dependencies = [ + "async-generator; python_version < \"3.7\"", + "certifi", + "charset-normalizer", + "httpcore<0.15.0,>=0.14.5", + "rfc3986[idna2008]<2,>=1.3", + "sniffio", +] +files = [ + {file = "httpx-0.22.0-py3-none-any.whl", hash = "sha256:e35e83d1d2b9b2a609ef367cc4c1e66fd80b750348b20cc9e19d1952fc2ca3f6"}, + {file = "httpx-0.22.0.tar.gz", hash = "sha256:d8e778f76d9bbd46af49e7f062467e3157a5a3d2ae4876a4bbfd8a51ed9c9cb4"}, +] + +[[package]] +name = "httpx" +version = "0.22.0" +extras = ["http2"] +requires_python = ">=3.6" +summary = "The next generation HTTP client." +dependencies = [ + "h2<5,>=3", + "httpx==0.22.0", +] +files = [ + {file = "httpx-0.22.0-py3-none-any.whl", hash = "sha256:e35e83d1d2b9b2a609ef367cc4c1e66fd80b750348b20cc9e19d1952fc2ca3f6"}, + {file = "httpx-0.22.0.tar.gz", hash = "sha256:d8e778f76d9bbd46af49e7f062467e3157a5a3d2ae4876a4bbfd8a51ed9c9cb4"}, +] + +[[package]] +name = "hyperframe" +version = "6.0.1" +requires_python = ">=3.6.1" +summary = "HTTP/2 framing layer for Python" +files = [ + {file = "hyperframe-6.0.1-py3-none-any.whl", hash = "sha256:0ec6bafd80d8ad2195c4f03aacba3a8265e57bc4cff261e802bf39970ed02a15"}, + {file = "hyperframe-6.0.1.tar.gz", hash = "sha256:ae510046231dc8e9ecb1a6586f63d2347bf4c8905914aa84ba585ae85f28a914"}, +] + +[[package]] +name = "idna" +version = "3.6" +requires_python = ">=3.5" +summary = "Internationalized Domain Names in Applications (IDNA)" +files = [ + {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, + {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, +] + +[[package]] +name = "immutables" +version = "0.19" +requires_python = ">=3.6" +summary = "Immutable Collections" +dependencies = [ + "typing-extensions>=3.7.4.3; python_version < \"3.8\"", +] +files = [ + {file = "immutables-0.19-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:fef6743f8c3098ae46d9a2a3606b04a91c62e216487d91e90ce5c7419da3f803"}, + {file = "immutables-0.19-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:cfb62119b7302a37cb4a1db44234dab9acda60ba93e3c28489969722e85237b7"}, + {file = "immutables-0.19-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d55b886e92ef5abfc4b066f404d956ca5789a2f8f738d448300fba40930a631"}, + {file = "immutables-0.19-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:40f1c3ab3ae690a55a2f61039705a110f0e23717d6d8a62a84600fc7cf5934dc"}, + {file = "immutables-0.19-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:f3096afb376b9b3651a3b92affd1896b4dcefde209f412572f7e3924f6749a49"}, + {file = "immutables-0.19-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:85bcb5a7c33100c1b2eeb8c71e5f80acab4c9dde074b2c2ca8e3dfb6830ce813"}, + {file = "immutables-0.19-cp310-cp310-win_amd64.whl", hash = "sha256:620c166e76030ca4772ea64e5190f8347a730a0af85b743820d351f211004397"}, + {file = "immutables-0.19-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:c1774f298db9d460e50c40dfc9cfe7dd8a0de22c22f1de9a1f9a468daa1201dc"}, + {file = "immutables-0.19-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:24dbdc28779a2b75e06224609f4fc850ba61b7e1b74e32ec808c6430a535be2d"}, + {file = "immutables-0.19-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9b8c0a4264e3ba2f025f4517ce67f0d0869106a625dbda08758cbf4dd6b6dd1f"}, + {file = "immutables-0.19-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28d1ee66424c2db998d27ebe0a331c7e09627e54a402848b2897cb6ef4dc4d7e"}, + {file = "immutables-0.19-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6f857aec0e0455986fd1f41234c867c3daf5a89ff7f54d493d4eb3c233d36d3c"}, + {file = "immutables-0.19-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:119c60a05cb35add45c1e592e23a5cbb9db03161bb89d1596b920d9341173982"}, + {file = "immutables-0.19-cp311-cp311-win_amd64.whl", hash = "sha256:3fbad255e404b4cbcf3477b384a1e400bd8f28cbbfc2df8d3885abe3bfc7b909"}, + {file = "immutables-0.19-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6660e185354a1cb59ecc130f2b85b50d666d4417be668ce6ba83d4be79f55d34"}, + {file = "immutables-0.19-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:37de95c1d79707d95f50d0ab79e067bee52381afc967ff031ac4c822c14f43a8"}, + {file = "immutables-0.19-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed61dbc963251bec7281cdb0c148176bbd70519d21fd05bce4c484632cdc3b2c"}, + {file = "immutables-0.19-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:7da9356a163993e01785a211b47c6a0038b48d1235b68479a0053c2c4c3cf666"}, + {file = "immutables-0.19-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:41d8cae52ea527f9c6dccdf1e1553106c482496acc140523034f91877ccbc103"}, + {file = "immutables-0.19-cp36-cp36m-win_amd64.whl", hash = "sha256:e95f0826f184920adb3cdf830f409f1c1d4e943e4dc50242538c4df9d51eea72"}, + {file = "immutables-0.19-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:50608784e33c88da8c0e06e75f6725865cf2e345c8f3eeb83cb85111f737e986"}, + {file = "immutables-0.19-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1cbd4d9dc531ee24b2387141a5968e923bb6174d13695e730cde0887aadda557"}, + {file = "immutables-0.19-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:eed8988dc4ebde8d527dbe4dea68cb9fe6d43bc56df60d6015130dc4abd2ab34"}, + {file = "immutables-0.19-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c830c9afc6fcb4a7d6d74230d6290987e664418026a15488ad00d8a3dc5ec743"}, + {file = "immutables-0.19-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:7c6cce2e87cd5369234b199037631cfed08e43813a1fdd750807d14404de195b"}, + {file = "immutables-0.19-cp37-cp37m-win_amd64.whl", hash = "sha256:10774f73af07b1648fa02f45f6ff88b3391feda65d4f640159e6eeec10540ece"}, + {file = "immutables-0.19-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:a208a945ea817b1455b5b0f9c33c097baf6443b50d749a3dc32ff445e41b81d2"}, + {file = "immutables-0.19-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:25a6225efb5e96fc95d84b2d280e35d8a82a1ae72a12857177d48cc289ac1e03"}, + {file = "immutables-0.19-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c0cf0d94b08e58896acf250cbc4682499c8a256fc6d0ee5c63d76a759a6a228"}, + {file = "immutables-0.19-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64c74c5171f3a97b178b880746743a07b08e7d7f6055370bf04a94d50aea0643"}, + {file = "immutables-0.19-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:8ababf72ed2a956b28f151d605a7bb1d4e1c59113f53bf2be4a586da3977b319"}, + {file = "immutables-0.19-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:52a91917c65e6b9cfef7a2d2c3b0e00432a153aa8650785b7ee0897d80226278"}, + {file = "immutables-0.19-cp38-cp38-win_amd64.whl", hash = "sha256:bbe65c23779e12e0ecc3dec2c709ad22b7cc8b163895327bc173ae06a8b73425"}, + {file = "immutables-0.19-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:480cc5d62efcac66f9737ae0820acd39d39e516e6fdbcf46cbdc26f11b429fd7"}, + {file = "immutables-0.19-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:2d88ff44e131508def4740964076c3da273baeeb406c1fe139f18373ea4196dd"}, + {file = "immutables-0.19-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7fa3148393101b0c4571da523929ae90a5b4bfc933c270a11b802a34a921c608"}, + {file = "immutables-0.19-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0575190a90c3fce6862ccdb09be3344741ff97a96e559893541886d372139f1c"}, + {file = "immutables-0.19-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:3754b26ef18b5d1009ffdeafc17fbd877a79f0a126e1423069bd8ef51c54302d"}, + {file = "immutables-0.19-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:648142e16d49f5207ae52ee1b28dfa148206471967b9c9eaa5a9592fd32d5cef"}, + {file = "immutables-0.19-cp39-cp39-win_amd64.whl", hash = "sha256:199db9070ffa1a037e6650ddd63159907a210e4998f932bdf50e70615629db0c"}, + {file = "immutables-0.19.tar.gz", hash = "sha256:df17942d60e8080835fcc5245aa6928ef4c1ed567570ec019185798195048dcf"}, +] + [[package]] name = "importlib-metadata" version = "6.7.0" @@ -500,6 +798,29 @@ files = [ {file = "pytz-2024.1.tar.gz", hash = "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812"}, ] +[[package]] +name = "rfc3986" +version = "1.5.0" +summary = "Validating URI References per RFC 3986" +files = [ + {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, + {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, +] + +[[package]] +name = "rfc3986" +version = "1.5.0" +extras = ["idna2008"] +summary = "Validating URI References per RFC 3986" +dependencies = [ + "idna", + "rfc3986==1.5.0", +] +files = [ + {file = "rfc3986-1.5.0-py2.py3-none-any.whl", hash = "sha256:a86d6e1f5b1dc238b218b012df0aa79409667bb209e58da56d0b94704e712a97"}, + {file = "rfc3986-1.5.0.tar.gz", hash = "sha256:270aaf10d87d0d4e095063c65bf3ddbc6ee3d0b226328ce21e036f946e421835"}, +] + [[package]] name = "six" version = "1.16.0" @@ -510,6 +831,19 @@ files = [ {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, ] +[[package]] +name = "sniffio" +version = "1.2.0" +requires_python = ">=3.5" +summary = "Sniff out which async library your code is running under" +dependencies = [ + "contextvars>=2.1; python_version < \"3.7\"", +] +files = [ + {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, + {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, +] + [[package]] name = "tomli" version = "1.2.3" diff --git a/pyproject.toml b/pyproject.toml index bc1290d8..7ae39331 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,7 @@ dependencies = [ "httplib2 >= 0.20.0", "pytz >= 2021.1", "six >= 1.16.0", + "httpx[http2]>=0.22.0", ] requires-python = ">=3.6.2" readme = "README.md" diff --git a/setup.py b/setup.py index 33763958..c314c533 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,7 @@ 'future >= 0.18.0', 'six >= 1.16.0', 'pytz >= 2021.1', + 'httpx[http2] >= 0.22.0', ], packages=find_packages(), platforms=['3.6, 3.7, 3.8, 3.9, 3.10, 3.11, 3.12'], diff --git a/tests/secrets/client.crt b/tests/secrets/client.crt index 8f7d010d..0af904e7 100644 --- a/tests/secrets/client.crt +++ b/tests/secrets/client.crt @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIC/zCCAeegAwIBAgIUdlIa8Il5Q2K9glxRRCYrVKxvm5kwDQYJKoZIhvcNAQEL +MIIC/zCCAeegAwIBAgIUDufwf8ZK2xZXqZUF/P/tbo1psVEwDQYJKoZIhvcNAQEL BQAwLjELMAkGA1UEBhMCQ0gxEDAOBgNVBAoMB3Rlc3QtY2ExDTALBgNVBAMMBHJv -b3QwHhcNMjQwMTAzMDYyODI0WhcNMzMxMjMxMDYyODI0WjAwMQswCQYDVQQGEwJD +b3QwHhcNMjQwMzA3MDI1NDA0WhcNMzQwMzA1MDI1NDA0WjAwMQswCQYDVQQGEwJD SDEQMA4GA1UECgwHdGVzdC1jYTEPMA0GA1UEAwwGY2xpZW50MIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy52qYqkYiPIq4SHaN80QLwNLtHC9uYp3uVJi -xkEujMuuosdTHbRr1vJxS9C+YyycOIXTeu0dIVrtRzwvsPt8Gq1k4vw5sjQAHT+s -3czxNdOIcXLst8KbdHrwYrJp+PE+XOxtLUd8+3knWRbizOdVqVk5onezfm+HDB8d -n4U/P3Pyw5CL7CAwdId9bWDi/MuJxrN/rw/Ll2hiy4G97t//Wk5yDxJckpStIzMF -YuMwMfry9S9uCNojLu+JiNOo8ojIzwu4VYbDiWcfcIt51I/Xpss8I4vsfbp4n1Vk -opO34fJG22oP4j91m3roBIIzd1+6TzocV4WFV7EzL7SjA1tIGwIDAQABoxMwETAP -BgNVHREECDAGhwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQDEHToxLkvIgOoA15W1 -EzLm7G0ia5NWoQIlFrn3Yp5c4rMFbXjLmH16w+caAt3P4Y14zoNbLbftCE5o7YzJ -SLWLzhSzqtpg9QXZUB8T/dNQS4BVPra0PV85nYpObxe2CcCp3mIT7HS6uTE76fX+ -F2pvtDDDEWSVGZPlSd25/6dzF5Jv4jVSlrFpyOLCoNfdIMbu87IcKS21A1oHptHv -ptIoE4PR3SkQOL4rOpViH+mZlg5zjRorpx7ug1yxyiyiOGYZZmdwYcA051Kb/0u4 -5Qdj+rqf/KSEGRVuREtE7VjMIm2/Fm2fkyuSQSNvo9qZT8esxzlrW+RD2NxpTvt7 -Qtmd +9w0BAQEFAAOCAQ8AMIIBCgKCAQEApdLcd4tpW/t5cR6qYgHvDO5lUEdIScOoO7e+ +GeIII7kAPJoPRMx5MtYBZfxJL3GWQkO1LxQaOOQSeowwCipQAsV2BkU72YR/Su39 +9rFUvXtaX/m+E4fspiLnA/sQRxQGJWP03a7QnxMo9uQoFDgp9BDxWTJXE9h2yGAt +zX8WPCuElXyroagXNqM/gVim6vMjfAS1wcmeJA2dGhuohABVZYPc8sqd90KOdEwM +NO/tTEewmS38FWqQguuXUKiYgNgbJPk17OXlKRkhtNNuomw4Rxy9d1FX+OsMsFw1 +jXeGJmSrodlSWIm6M3tr+os3OZdhK/9aENaU1ug34gr4JvKQgwIDAQABoxMwETAP +BgNVHREECDAGhwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQAyU86c/4xbmwKbei5a +EmCgnRZULw0dHv53PC3DjGJFKRy9XesV+aH9p+yDI9+u32mChHyDNYLN8Xr96PYh +EwJ8eFSBqqCGxK8jIEyxBWAMLEx/XhtBwwQ7Ng6e0zn4rWLTp25O34AI75bUeMh2 +J4VNpoNClKo/xdOBrTbpA8l/E0dXEHH3KsMJEEFwLKItAiuuHdgruZjq6QS1xyhf +56r6ze8tWtbllnASfoPWDrEXuSZK5EapeljNOUvvVmaOuCouGPcbSOt40o609N27 +nuvm7NnaswWj4M2qnxcUxyvOgryl/MQC7gEHr+1skOZP1m8+YEBWtMB85iC03BKF +j4ah -----END CERTIFICATE----- diff --git a/tests/secrets/client.csr b/tests/secrets/client.csr index 26ea58a8..543b76c7 100644 --- a/tests/secrets/client.csr +++ b/tests/secrets/client.csr @@ -1,16 +1,16 @@ -----BEGIN CERTIFICATE REQUEST----- MIIClzCCAX8CAQAwMDELMAkGA1UEBhMCQ0gxEDAOBgNVBAoMB3Rlc3QtY2ExDzAN -BgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMud -qmKpGIjyKuEh2jfNEC8DS7RwvbmKd7lSYsZBLozLrqLHUx20a9bycUvQvmMsnDiF -03rtHSFa7Uc8L7D7fBqtZOL8ObI0AB0/rN3M8TXTiHFy7LfCm3R68GKyafjxPlzs -bS1HfPt5J1kW4sznValZOaJ3s35vhwwfHZ+FPz9z8sOQi+wgMHSHfW1g4vzLicaz -f68Py5doYsuBve7f/1pOcg8SXJKUrSMzBWLjMDH68vUvbgjaIy7viYjTqPKIyM8L -uFWGw4lnH3CLedSP16bLPCOL7H26eJ9VZKKTt+HyRttqD+I/dZt66ASCM3dfuk86 -HFeFhVexMy+0owNbSBsCAwEAAaAiMCAGCSqGSIb3DQEJDjETMBEwDwYDVR0RBAgw -BocEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAo1COKOjEN2P6mw4XHKc9Oq9WKuSH -83r8nF4CicTGSmh/jvffFWjfgyeUexQat3jr2G/XLzIUcXaVGKNcPeXhEAsHFS/g -uoinSA5yLAuhAjc0GiBQufUYqqa36MGAdl9iytYsHriefWFtsGYF1qLdCclFDePT -4E/T8vY0cHnLyU9enR+eD5Vw1FIdw4u2GDk/by9ELr7f319BtfQighRimUKw3vBc -eonYzmira1Yopvtp1KGIjnzeE07/cdXz4Tz2HG2Rxf4d1xoIljA+4rd7DnvTxIXH -mGDh9N9wCfpvIFlpsbq4ndVohy/jgheSQTv2P7QW10d/EpNk6xaD+/8Wnw== +BgNVBAMMBmNsaWVudDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKXS +3HeLaVv7eXEeqmIB7wzuZVBHSEnDqDu3vhniCCO5ADyaD0TMeTLWAWX8SS9xlkJD +tS8UGjjkEnqMMAoqUALFdgZFO9mEf0rt/faxVL17Wl/5vhOH7KYi5wP7EEcUBiVj +9N2u0J8TKPbkKBQ4KfQQ8VkyVxPYdshgLc1/FjwrhJV8q6GoFzajP4FYpurzI3wE +tcHJniQNnRobqIQAVWWD3PLKnfdCjnRMDDTv7UxHsJkt/BVqkILrl1ComIDYGyT5 +Nezl5SkZIbTTbqJsOEccvXdRV/jrDLBcNY13hiZkq6HZUliJujN7a/qLNzmXYSv/ +WhDWlNboN+IK+CbykIMCAwEAAaAiMCAGCSqGSIb3DQEJDjETMBEwDwYDVR0RBAgw +BocEfwAAATANBgkqhkiG9w0BAQsFAAOCAQEAo4dfWo//pOSZarRDBffwHdRVuDhl +/g9PmosAIn8nnMi3gAof0PssPTdhFQbpSpCkEceYNC4aSJSn+asOpv8Z9X3mh6C1 +z8GIZW/7iof0QU5W3QQHAw6uvIalMS9wJOO+Am5zKZsZJuncTcw5hA8tt3ruqXkx +o26OUA76QUUI9aIfAo0tRFbuSZMzWsiYDRyiQvq+6kaObC9pvSV5qxcqbeDICR1Q +g+9YYdVW6I93wu9mCIZ7EBgjLgmKQ/wcQDrwlCfM7tY84cSEzCrI7xQD+84k57wt +VGnjEnocbNyNkFrKDwVPgRoJkCAWRlb/Kw0kriOEbEzI3mgYml+tgGk7fQ== -----END CERTIFICATE REQUEST----- diff --git a/tests/secrets/client.key b/tests/secrets/client.key index c4e72694..5e9a9f35 100644 --- a/tests/secrets/client.key +++ b/tests/secrets/client.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/secrets/root..cnf b/tests/secrets/root..cnf deleted file mode 100644 index 1dc3cbc0..00000000 --- a/tests/secrets/root..cnf +++ /dev/null @@ -1,21 +0,0 @@ -[ req ] -default_bits = 2048 -prompt = no -distinguished_name = dn -req_extensions = req_ext - -[ dn ] -C = CH -O = test-ca -CN = root. - -[ v3_ca ] -basicConstraints = critical,CA:TRUE -subjectKeyIdentifier = hash -authorityKeyIdentifier = keyid:always,issuer:always - -[ req_ext ] -subjectAltName = @alt_names - -[alt_names] -IP.1 = 127.0.0.1 diff --git a/tests/secrets/root..crt b/tests/secrets/root..crt deleted file mode 100644 index 37b88b6b..00000000 --- a/tests/secrets/root..crt +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICfTCCAeagAwIBAgIUdlIa8Il5Q2K9glxRRCYrVKxvm5cwDQYJKoZIhvcNAQEL -BQAwLjELMAkGA1UEBhMCQ0gxEDAOBgNVBAoMB3Rlc3QtY2ExDTALBgNVBAMMBHJv -b3QwHhcNMjQwMTAzMDYyODEwWhcNMzMxMjMxMDYyODEwWjAvMQswCQYDVQQGEwJD -SDEQMA4GA1UECgwHdGVzdC1jYTEOMAwGA1UEAwwFcm9vdC4wggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQDJn/RnN70FrcBf/1Er2tbG+kdPAvmKTmZA0AsX -SgdauJKZFy4kguyUyoyo01kbVtTGKsMSyQWW/AzWFzLDsI25j0ODKie51TuKzhqt -8sjw3T1L0I63sPy2EOiiqx9yipdzrU5tPaBY9WGnKa6oN92rrSjP3iqMw9A8WJgj -U7iLRlrDkQDoX5w+6KP/04YS5AdP0tXsIYwdiMzH2Ia7fT01aOxwRcuBjJuez+Jc -8exZ3z26+8UudkxD2bUhk+bky1bCTWKu1noPEdRp0LPzNrNkf/ns67VefNYKKyb3 -mMEx0DyDhjyxLmhB5WJaeTpZhuOyXHBBUJS+iwKselZcFB15AgMBAAGjEzARMA8G -A1UdEQQIMAaHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEAilj9krR6mQ5I3WcSoSKa -KD5WyibTP2LU23XAwKMCoPuciIFteoqXAI1wvsVKbfADezssnakOiOVCdCSiTYW/ -RnRdQFb7bf3ifJSKTOSLq/kDJfebBLcGYF2Ig5EqpY4SH5VvSmmSRWWDszA+rGbI -ry4FFFc3jUJnxmt43WqzcYc= ------END CERTIFICATE----- diff --git a/tests/secrets/root..csr b/tests/secrets/root..csr deleted file mode 100644 index b71b9ce5..00000000 --- a/tests/secrets/root..csr +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN CERTIFICATE REQUEST----- -MIICljCCAX4CAQAwLzELMAkGA1UEBhMCQ0gxEDAOBgNVBAoMB3Rlc3QtY2ExDjAM -BgNVBAMMBXJvb3QuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyZ/0 -Zze9Ba3AX/9RK9rWxvpHTwL5ik5mQNALF0oHWriSmRcuJILslMqMqNNZG1bUxirD -EskFlvwM1hcyw7CNuY9DgyonudU7is4arfLI8N09S9COt7D8thDooqsfcoqXc61O -bT2gWPVhpymuqDfdq60oz94qjMPQPFiYI1O4i0Zaw5EA6F+cPuij/9OGEuQHT9LV -7CGMHYjMx9iGu309NWjscEXLgYybns/iXPHsWd89uvvFLnZMQ9m1IZPm5MtWwk1i -rtZ6DxHUadCz8zazZH/57Ou1XnzWCism95jBMdA8g4Y8sS5oQeViWnk6WYbjslxw -QVCUvosCrHpWXBQdeQIDAQABoCIwIAYJKoZIhvcNAQkOMRMwETAPBgNVHREECDAG -hwR/AAABMA0GCSqGSIb3DQEBCwUAA4IBAQCW1WkHqT9omXgjg3a10RwxGhsglvwx -unSPL30a/70bnGq0Ix/8eqWMkZgmuc4rEjsRar7TsvVsZkETieSO8RauT8k0B2w2 -hizv5W4PFXhm+8RdNCdX65qWwlWThcxUUJTJaEQjGHcVsBpR2UfShPVaLklD1qN6 -LRcaz2XegrFeg9GyHMkrs3pHiU7k9dsZW9+YVkcuIjDK0FF7NeiWqsHgNH0A1NK/ -eW04s0gtV01qkhJD0WOIl3he4BqYOAogycUiydVrazlhNcuim52fn82ZUOmgeH6I -UMk+R2prusBuJFYcS+KHPW91qv1q4lPAefK06D1SkN2cM0rb+mIdQZEz ------END CERTIFICATE REQUEST----- diff --git a/tests/secrets/root..key b/tests/secrets/root..key deleted file mode 100644 index b413ee72..00000000 --- a/tests/secrets/root..key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEAyZ/0Zze9Ba3AX/9RK9rWxvpHTwL5ik5mQNALF0oHWriSmRcu -JILslMqMqNNZG1bUxirDEskFlvwM1hcyw7CNuY9DgyonudU7is4arfLI8N09S9CO -t7D8thDooqsfcoqXc61ObT2gWPVhpymuqDfdq60oz94qjMPQPFiYI1O4i0Zaw5EA -6F+cPuij/9OGEuQHT9LV7CGMHYjMx9iGu309NWjscEXLgYybns/iXPHsWd89uvvF -LnZMQ9m1IZPm5MtWwk1irtZ6DxHUadCz8zazZH/57Ou1XnzWCism95jBMdA8g4Y8 -sS5oQeViWnk6WYbjslxwQVCUvosCrHpWXBQdeQIDAQABAoIBAG61PoyiZU7F7diI -J3jOC5pr+FWhC4XusGSsFzrtcgZVTGF1AegYX3D/mqZkjgvd7Kz28+/PoxsZQK8Z -Q82BlwApcueFcRSvyabYrnuO0Ni4khyb4pFoRApwVFxlW7oX8TsaEPMYoH/YFIul -7nn9WuEWDk+87F4ocqF//+F96dnGiDuru0AHTMYmXlk+pHU3RnMwWFo+c8Fi0RRF -7YnIWp/621ysuWDln3cbxrPOTV69eUGzLSyqSTZCCmiasLKF0Lwcb0bfx0bvPEow -Rnh9RuVYAR5bauN8w5gwN2kuSSSTgtSOPGuPwQ7fz7ZQusD/NKKi8/PKOo5bDNw9 -iaczmFECgYEA+EDxKVop3EjI4uZKKWwSK9PhdBrkgmPRTdC6vGy5tpPG/uJ2Ajgg -spC1uLhtVvKqOsZithsIOU4a+G74c6gY+QhJNcTBTIVbLHbhfw0mpj4puEX0nr5K -vfmbukpDjVSVmZfEeRv42Uq7ijV+ef6vSSo2JCGlYY+wlc6moBr+vb0CgYEAz+qK -ORAPK++HPTxqvOnHgj3sgU6h7DXWzw4PKG+hrmzV5qR0hPkYs5oR5b+3CQ5ugBrj -zrAB624mJH6cGGrT74QRrqxEpFSwS2J8d1TjNzmfuGBeT9Z8VCv+VCUZtl90ZIeu -xtXeKFrN2usEmphkumk/vX7VG0LnSwenqY615G0CgYEAyiKGunbxsq2I9Ecyh3u5 -Z/pDjnf/K7P+zm9wPNACfwjgdNUL5U6yQPLXJCr2zF8WAHlcEo78KTzRdQtWPUXX -353BjohAJABJdnDttreMirv+2E4Nmduzm+/LvumNC1yd2svabAo8myDghu57pvWa -3+YA43aJ5GBNFg2HWsHgPbkCgYEAw+LUIVjpAlrkzqPKaHvVFPckiNs9oR9EZ8V2 -MIGkEYLGsEtG4DUTubqxnATY/LZVE2rCMGwREu+vDfkfNb4IOQPz6N6yuSR1CEEc -xQz8GX635W0dzhhlAKSGNF7T78fVEBXpa7n5WYnboqKDrudfF2WrwOvq+Yk6Aq2O -oCgtZK0CgYEAqN9KNc6sgSPI3s844qFTfJPMdeeIhEK3Feh65ORM6ds1Gupa/A1A -YRfFUMTes2jZ7DcOrqBeZi9fiV1c7KN2SDqMuu7id+englhT7HxBG1FlNfFJWmI2 -2bzemjWBFpG3zKxiqoFg0oNwU7V2i1M3+JWiiw8eRG5yukLTuNfI0do= ------END RSA PRIVATE KEY----- diff --git a/tests/secrets/root.crt b/tests/secrets/root.crt index c9233a3a..6086df71 100644 --- a/tests/secrets/root.crt +++ b/tests/secrets/root.crt @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/tests/secrets/root.csr b/tests/secrets/root.csr index cf09dabb..c581fdde 100644 --- a/tests/secrets/root.csr +++ b/tests/secrets/root.csr @@ -1,16 +1,16 @@ -----BEGIN CERTIFICATE REQUEST----- MIIClTCCAX0CAQAwLjELMAkGA1UEBhMCQ0gxEDAOBgNVBAoMB3Rlc3QtY2ExDTAL -BgNVBAMMBHJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPic7d -Vs7/GeW+zCuF5nPFqyY1CNO3Aw9d9MqXTszpAuLOfjhsBgpsMcLKFFCZsrfpJ+kT -1IyGe+IcNuBSxPYAz7oqIhA9R0DKZlr6iUEaEo6yWq8qQ3q6NZPN0Uw1d9avPGXO -tdZGLFbBQDiu6/Z0TBvyDnqH4GaOMwXLDq5bPth8bLpzrgUWv6EB2SqYNc2AkXmL -tWbB0df7yhlLPp5fWxxz0BZa6vSHB1JkL9zS2qcZzKpTUMWtsZdw+UviIZfFnwla -FA2sDGSzbPx60Euw1ghg7EXfAHKwkqJFGXcAc5tWZd0ncuhHoNzmZGJeNfNIU7Rm -SQCRvuFmlRhES0PfAgMBAAGgIjAgBgkqhkiG9w0BCQ4xEzARMA8GA1UdEQQIMAaH -BH8AAAEwDQYJKoZIhvcNAQELBQADggEBAE+0nwmGkRpzBRhVUGHnAVxGSVgGMDKb -QczFyIjfra10AT4eue+SsfDvPaPRnS1bnPXGEMBsPZ5A4iW4z8NEuKC9u9hwnx27 -L0G+aGmz3921utL9NjbkJAtZ+Q5qfrXFbc7d9m1mA+HpbN3QNqHNt5q3Rx1WcEmG -+PgJtd3Ls/jiH+2d/LcGiOPEdzkHlhVVTvCs1Ijykp4+wNsS1miVVn5i/2DxJgmc -9AWqMN68By0ODc0EIauBVKzZ5DgzQyAlWgJZVU3JkXO76arhUqzrf5ibXjk/KUhw -LVqO7PkYKyqQKZE8sAnmPfWQ2vulJeZuH/4e/KSyh8Q4WET2QmfAhfU= +BgNVBAMMBHJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4n08a +ywmoBuXO9+ddQPkLGEVMSwmUPMPWqRBhHGXHe4/NZDa/UR6qYPcgkhCfuPK7qAWJ +QlF5wY2byxCPbgIuhcXte6j3iQMqJfLEMMlWOwLY3jl4nbwxFnYU4lxHZ3lJTheR +EmKfRccCR/04pv7xBsmYkv7n3gu4a5E3yoQvN7Yp3XxSHvecV6bWxr2xI1EVp91U +1pd/4Rqb5nn5cA8DO4mb+PKiUb3ZSrzLGcEM/G+/wxFEIFdcETKUwW2Fg6Ke3Jyw +T1vT/K9ANCWmYrL6Kr9RYn9q/dNQywLOxN4V/RCdU3KBgz7Y1MY+vFkBHc8AQbmF +72qD+2EEh4fCHO4ZAgMBAAGgIjAgBgkqhkiG9w0BCQ4xEzARMA8GA1UdEQQIMAaH +BH8AAAEwDQYJKoZIhvcNAQELBQADggEBAAfhFkpaOZXWKyyjlra+EAB4prOb9eZ2 +ECdLkaczjXUGC8JYb+653sxWY/Ntf0Yh2YloGa6kGweJxG6xXXgq5WaVC+tT22kC +WHWwCTI6TlbYJSQqkNDM/E/k+rlYVpKyCqLkiPq4aNmN7w0LcDOX1GSQzJ1ujJPr +3R5TiIdlNpHxRBU+lD2Mq4rttBLXrFfUWHgAh2n3kYMdxG4ZQv98OWlTKx668p+j +Nov0tF0PiJ2jVqlSerCLJ0hreOc1/+UjtAYrUDzF5F2rdOO6AZxNIkcgIZd+4cei +5vppVLv9BjvDbnZgroKHIlxko+LCDf3SWx8g1ZRlCzZvw6ZC9zTFByU= -----END CERTIFICATE REQUEST----- diff --git a/tests/secrets/root.key b/tests/secrets/root.key index b981fd07..9b78ab71 100644 --- a/tests/secrets/root.key +++ b/tests/secrets/root.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/secrets/root.srl b/tests/secrets/root.srl index 60438eb0..4a1bdb5c 100644 --- a/tests/secrets/root.srl +++ b/tests/secrets/root.srl @@ -1 +1 @@ -76521AF089794362BD825C5144262B54AC6F9B99 +0EE7F07FC64ADB1657A99505FCFFED6E8D69B151 diff --git a/tests/secrets/server.cnf b/tests/secrets/server.cnf index a3c79a92..a522763c 100644 --- a/tests/secrets/server.cnf +++ b/tests/secrets/server.cnf @@ -19,6 +19,7 @@ subjectAltName = @alt_names [alt_names] IP.1 = 127.0.0.1 +IP.2 = 192.168.8.202 DNS.1 = localhost DNS.2 = graphd0 DNS.3 = graphd1 diff --git a/tests/secrets/server.crt b/tests/secrets/server.crt index 2efdaf9a..2303d3bb 100644 --- a/tests/secrets/server.crt +++ b/tests/secrets/server.crt @@ -1,19 +1,19 @@ -----BEGIN CERTIFICATE----- -MIIDJTCCAg2gAwIBAgIUdlIa8Il5Q2K9glxRRCYrVKxvm5gwDQYJKoZIhvcNAQEL +MIIDKzCCAhOgAwIBAgIUDufwf8ZK2xZXqZUF/P/tbo1psVAwDQYJKoZIhvcNAQEL BQAwLjELMAkGA1UEBhMCQ0gxEDAOBgNVBAoMB3Rlc3QtY2ExDTALBgNVBAMMBHJv -b3QwHhcNMjQwMTAzMDYyODIxWhcNMzMxMjMxMDYyODIxWjAwMQswCQYDVQQGEwJD +b3QwHhcNMjQwMzA3MDI1NDAyWhcNMzQwMzA1MDI1NDAyWjAwMQswCQYDVQQGEwJD SDEQMA4GA1UECgwHdGVzdC1jYTEPMA0GA1UEAwwGc2VydmVyMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvs8bs9U7tHGG30UUjw8r0HFEuIE95YxGP7zi -8U33odk8+us+FR0MrKZ7pK9tXUVt+gka8cs5X5Qd2c2GPTt3qkMX4gJ5/Jvf6fXu -ca4s+nUVnlKMNPG9TwnNyW+moC9BEPra5RUMDRwtbfF2fWg6EpLHmH/wKRdx+vCy -aHazTAY1cnOhJ0mkofswxJov6++dS6prFWHZ+n2RCq+/toYQ5oGoXa39GzyEVzrv -nCGUxNFNcS3d8hrlf8CxGT8XLB8n2piIVeQZiKyRvYTZGSwf2eL+JyrlewQNw7Gb -OuMDjmfr5wyLV9ifrBoLKckqCNE5xeifZTiUzYRTDw3XSN8uBwIDAQABozkwNzA1 -BgNVHREELjAshwR/AAABgglsb2NhbGhvc3SCB2dyYXBoZDCCB2dyYXBoZDGCB2dy -YXBoZDIwDQYJKoZIhvcNAQELBQADggEBABiHxM4xQjbt+KJuexPBLqalJhRVdpLe -S5dCS0el8QnnVyExz65OS+wKPF7DCoxkm9M9jiADIiKV1HEzHgH7mOeKBjhIWjmu -fbHuhmxUsqi7PbvU3NEGQbCjcvcE5taG3wyr9B4lvMhuMTUGZLzlqheHd4FzD5Q6 -gGvKY91Y7MFHn8J+TvZht5wtXGGYIQHDGLplxFtpHz2bTVDwPEp/gSky3UVrxOx0 -sukFw+jj5Z2KGkYYcuFqJK2Vgp0Wmfi3xxOd0UOh0wqjuHEtaXB6XTcPnYv2DkDk -78kNMMeAi8qR4ES2Vx6Oq6Gr+/f/BnQ7R+t+2XEEHH73iGadRw3XlpI= +9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuBC99fcKfK2myIpU4G7BufjJqwEH66PGUeay +mEbj8V7wfm8CoAuE/UcX/0r+U8cgxbRfv9zmtXt/6j6bk1lLmQ123+JHBOGN5HDc +DjGl4y/eL7/uwFJnQ0FAd/Jf/vU8iOpx1MWrrSuEklq3eacoCMqAPkD+oXp1Eeq4 +L5YvsecSYYOa25WrDYvgFhVUa4BIB3K/j8H2f+T0NVJank2b597pmtAxox+ds8+4 +WI5Aex0DCYd1EBoZMYJPZzSWYzPVCardM9uOcFPDZ1ynGdWgDlIhUFrl/IcWIqNb +wTVZ0WoUZTJsKoZlX8H2fowr4M5pZMHw7MQfT9BPyVu5Yt1sxwIDAQABoz8wPTA7 +BgNVHREENDAyhwR/AAABhwTAqAjKgglsb2NhbGhvc3SCB2dyYXBoZDCCB2dyYXBo +ZDGCB2dyYXBoZDIwDQYJKoZIhvcNAQELBQADggEBAIDb2/S4oflgpsySMdbsqfh3 +siwRY2dkZ5sNYHRxG3rZZXtyYnsj+KWWFZrYZrbPGF2qDxTl5AWj4LL3GUZGfgPK +HarGhb8Qtr25fvYhPQ6azxGmolZ1n5i+9kjquupANW89KiEs8f5dgXChKjN9i6um +gmCTh9di+Dtmtsy66bl/jMiRxX0XHi5E1XMANfXUMPtbZz/kW1wCy+XU439hdMds +U8/MJaS9uYL763O5Ept6tWFDIlbveUmcoZBPmZXb9LdXjWgPeBHx6y83AoUFViGE +lxB+1zJJyBwPTNz+IPzBKVJkiEttL/MC9YSS2pJOtCK5FXYNcdOxOaV617ENbMY= -----END CERTIFICATE----- diff --git a/tests/secrets/server.csr b/tests/secrets/server.csr index c1293a11..5ea96559 100644 --- a/tests/secrets/server.csr +++ b/tests/secrets/server.csr @@ -1,17 +1,17 @@ -----BEGIN CERTIFICATE REQUEST----- -MIICvTCCAaUCAQAwMDELMAkGA1UEBhMCQ0gxEDAOBgNVBAoMB3Rlc3QtY2ExDzAN -BgNVBAMMBnNlcnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7P -G7PVO7Rxht9FFI8PK9BxRLiBPeWMRj+84vFN96HZPPrrPhUdDKyme6SvbV1FbfoJ -GvHLOV+UHdnNhj07d6pDF+ICefyb3+n17nGuLPp1FZ5SjDTxvU8JzclvpqAvQRD6 -2uUVDA0cLW3xdn1oOhKSx5h/8CkXcfrwsmh2s0wGNXJzoSdJpKH7MMSaL+vvnUuq -axVh2fp9kQqvv7aGEOaBqF2t/Rs8hFc675whlMTRTXEt3fIa5X/AsRk/FywfJ9qY -iFXkGYiskb2E2RksH9ni/icq5XsEDcOxmzrjA45n6+cMi1fYn6waCynJKgjROcXo -n2U4lM2EUw8N10jfLgcCAwEAAaBIMEYGCSqGSIb3DQEJDjE5MDcwNQYDVR0RBC4w -LIcEfwAAAYIJbG9jYWxob3N0ggdncmFwaGQwggdncmFwaGQxggdncmFwaGQyMA0G -CSqGSIb3DQEBCwUAA4IBAQB4TGVy1J8BIqWNwK4LNhFm2p8eGsxELxFCNSLk18qU -R7iVHMWdsc1erHQ1DRT+amQ8Oy5c02W+P4wLIw5KG3ET3ZtEK+Z0OBbi6kbBxcYo -I0eZYqbGR0pCov7zOs1V9OPnB0vPjMgGALtTN7B44gO+ssK/Lv3AKNvqVqO6HcOW -eyMDV1s3io/u+oROWgWbs9TPrfiv0mxIFQt+yjT1CSIDn7LnxQy/z2kp9lAaayTt -hfPI+mvzCfKhrQa2yQx5Q3qRdSIZtkeD7tUwZpJDfjjP+ftmkAtV7REhEEVZFjuh -CV5hw3C5Z9/wR3o9n/8NR1058Y4U4aZ3ETqu+L0GBbJU +MIICwzCCAasCAQAwMDELMAkGA1UEBhMCQ0gxEDAOBgNVBAoMB3Rlc3QtY2ExDzAN +BgNVBAMMBnNlcnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALgQ +vfX3CnytpsiKVOBuwbn4yasBB+ujxlHmsphG4/Fe8H5vAqALhP1HF/9K/lPHIMW0 +X7/c5rV7f+o+m5NZS5kNdt/iRwThjeRw3A4xpeMv3i+/7sBSZ0NBQHfyX/71PIjq +cdTFq60rhJJat3mnKAjKgD5A/qF6dRHquC+WL7HnEmGDmtuVqw2L4BYVVGuASAdy +v4/B9n/k9DVSWp5Nm+fe6ZrQMaMfnbPPuFiOQHsdAwmHdRAaGTGCT2c0lmMz1Qmq +3TPbjnBTw2dcpxnVoA5SIVBa5fyHFiKjW8E1WdFqFGUybCqGZV/B9n6MK+DOaWTB +8OzEH0/QT8lbuWLdbMcCAwEAAaBOMEwGCSqGSIb3DQEJDjE/MD0wOwYDVR0RBDQw +MocEfwAAAYcEwKgIyoIJbG9jYWxob3N0ggdncmFwaGQwggdncmFwaGQxggdncmFw +aGQyMA0GCSqGSIb3DQEBCwUAA4IBAQBhnzQa1F8ukbNIBH8JE8NxW2PDR3RYGxT2 +YuR/cGKghBdkau4gw/MKVGk2bs/ixaTopOXFSPEtusvxx6p3/qFXjb79h5XM5G4T +O1LOCxd4KValtwvJkzJhgzaXv3nQaCgmh1TKMsu1A0w/erYCLaDhUyFEIESUyilI +lFVq7qfJX1CDz8jMPeFPNkjn5hZn+dPLmsP5JMgSvTmBstO3aPG/46DImkpHFZ5s +lA3Rvhk/E1WCXBQBf0ri+fPw9cHtR366zv1sEpLmmPIHdjZdbRuRToQBQ4o7kOpL +yaI+Tg6vp6nhagqqwVoLrkDRfwkj2nXGB7d56/MkyIXFnm+Yqnkq -----END CERTIFICATE REQUEST----- diff --git a/tests/secrets/server.key b/tests/secrets/server.key index 1bc36d6a..2d20d08d 100644 --- a/tests/secrets/server.key +++ b/tests/secrets/server.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- From b6141aa22a3ff21f6a4bd519cd106f3b06105b6f Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 10:51:45 +0800 Subject: [PATCH 2/9] fix pip install pytest error --- .github/workflows/run_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run_test.yaml b/.github/workflows/run_test.yaml index 0899a8f7..4e5c1a01 100644 --- a/.github/workflows/run_test.yaml +++ b/.github/workflows/run_test.yaml @@ -25,6 +25,7 @@ jobs: - name: Install nebulagraph-python from source and test dependencies run: | python setup.py install + pip install --upgrade pip pip install pip-tools pytest - name: Test with pytest run: | From 6b9b97756e2da89e998a375a282166d893ba7866 Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:37:10 +0800 Subject: [PATCH 3/9] update --- .github/workflows/run_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_test.yaml b/.github/workflows/run_test.yaml index 4e5c1a01..933db0e8 100644 --- a/.github/workflows/run_test.yaml +++ b/.github/workflows/run_test.yaml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - name: Install nebulagraph-python from source and test dependencies From e14105eac7ec1b3c99ecd8428026276d80761898 Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:38:56 +0800 Subject: [PATCH 4/9] update --- .github/workflows/run_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run_test.yaml b/.github/workflows/run_test.yaml index 933db0e8..6caee1df 100644 --- a/.github/workflows/run_test.yaml +++ b/.github/workflows/run_test.yaml @@ -22,6 +22,7 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} + architecture: 'x64' - name: Install nebulagraph-python from source and test dependencies run: | python setup.py install From 983330884ca14839fd28c7f6e513b029e9452ab0 Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:39:41 +0800 Subject: [PATCH 5/9] update --- .github/workflows/run_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_test.yaml b/.github/workflows/run_test.yaml index 6caee1df..910b0d68 100644 --- a/.github/workflows/run_test.yaml +++ b/.github/workflows/run_test.yaml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} architecture: 'x64' From 13b8c2688e27f2b1cf4b15428f17bcd4a7753a48 Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:59:06 +0800 Subject: [PATCH 6/9] update --- .github/workflows/run_test.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_test.yaml b/.github/workflows/run_test.yaml index 910b0d68..1bed0cb8 100644 --- a/.github/workflows/run_test.yaml +++ b/.github/workflows/run_test.yaml @@ -25,8 +25,10 @@ jobs: architecture: 'x64' - name: Install nebulagraph-python from source and test dependencies run: | - python setup.py install - pip install --upgrade pip + python -m pip install --upgrade pip + # remove pyproject.toml to avoid pdm install + rm pyproject.toml + pip install . pip install pip-tools pytest - name: Test with pytest run: | From 61e5134983f12ff0686edeb8f19a90a7022cc2bc Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 12:10:12 +0800 Subject: [PATCH 7/9] update --- .github/workflows/run_test.yaml | 1 - pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run_test.yaml b/.github/workflows/run_test.yaml index 1bed0cb8..4040d285 100644 --- a/.github/workflows/run_test.yaml +++ b/.github/workflows/run_test.yaml @@ -22,7 +22,6 @@ jobs: uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - architecture: 'x64' - name: Install nebulagraph-python from source and test dependencies run: | python -m pip install --upgrade pip diff --git a/pyproject.toml b/pyproject.toml index 7ae39331..e5d11d37 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ dependencies = [ "httplib2 >= 0.20.0", "pytz >= 2021.1", "six >= 1.16.0", - "httpx[http2]>=0.22.0", + "httpx[http2] >= 0.22.0", ] requires-python = ">=3.6.2" readme = "README.md" From 6c8ffef04ed36c0b206d7ca6c84077a6bdf19591 Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 14:32:08 +0800 Subject: [PATCH 8/9] update --- .github/workflows/run_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run_test.yaml b/.github/workflows/run_test.yaml index 4040d285..6be4c15b 100644 --- a/.github/workflows/run_test.yaml +++ b/.github/workflows/run_test.yaml @@ -62,6 +62,7 @@ jobs: - name: Install dependencies run: | + python -m pip install --upgrade pip pip install . pdm install -G:dev pdm install -G:test From 6a0077ef6454f5989aed71673fec2578192a344e Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 8 Mar 2024 16:25:53 +0800 Subject: [PATCH 9/9] update --- .github/workflows/run_test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_test.yaml b/.github/workflows/run_test.yaml index 6be4c15b..82c6c5df 100644 --- a/.github/workflows/run_test.yaml +++ b/.github/workflows/run_test.yaml @@ -42,7 +42,7 @@ jobs: strategy: max-parallel: 2 matrix: - python-version: [3.7, 3.8, 3.9, '3.10', 3.11, 3.12] + python-version: [3.7, 3.8, 3.9, '3.10', 3.11] steps: - name: Maximize runner space