From bf9a4478a349f73d85e526cf30d9ed77c2b5944d Mon Sep 17 00:00:00 2001 From: xtaodada Date: Mon, 27 Mar 2023 19:51:58 +0800 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Bump=20all=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #497 --- .gitignore | 10 ++++- core/override/telegram.py | 15 ++++++- poetry.lock | 86 +++++++++++---------------------------- requirements.txt | 16 +++----- 4 files changed, 51 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index 96679aa..15b2e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ htmlcov/ .coverage .coverage.* .cache +cache/ nosetests.xml coverage.xml *.cover @@ -144,4 +145,11 @@ plugins/private ### mtp ### paigram.session -paigram.session-journal \ No newline at end of file +paigram.session-journal + +### ide ### +.idea/ +.vscode/ + +### Docker ### +docker-compose.yml diff --git a/core/override/telegram.py b/core/override/telegram.py index 18698b1..d3fac5a 100644 --- a/core/override/telegram.py +++ b/core/override/telegram.py @@ -77,7 +77,9 @@ class HTTPXRequest(DefaultHTTPXRequest): write_timeout: Optional[float] = 5.0, connect_timeout: Optional[float] = 5.0, pool_timeout: Optional[float] = 1.0, + http_version: str = "1.1", ): + self._http_version = http_version timeout = Timeout( connect=connect_timeout, read=read_timeout, @@ -88,19 +90,28 @@ class HTTPXRequest(DefaultHTTPXRequest): max_connections=connection_pool_size, max_keepalive_connections=connection_pool_size, ) + if http_version not in ("1.1", "2"): + raise ValueError("`http_version` must be either '1.1' or '2'.") + http1 = http_version == "1.1" self._client_kwargs = dict( timeout=timeout, proxies=proxy_url, limits=limits, transport=AsyncHTTPTransport(limits=limits), + http1=http1, + http2=not http1, ) try: self._client = self._build_client() except ImportError as exc: - if "httpx[socks]" not in str(exc): + if "httpx[http2]" not in str(exc) and "httpx[socks]" not in str(exc): raise exc + if "httpx[socks]" in str(exc): + raise RuntimeError( + "To use Socks5 proxies, PTB must be installed via `pip install " "python-telegram-bot[socks]`." + ) from exc raise RuntimeError( - "To use Socks5 proxies, PTB must be installed via `pip install python-telegram-bot[socks]`." + "To use HTTP/2, PTB must be installed via `pip install " "python-telegram-bot[http2]`." ) from exc diff --git a/poetry.lock b/poetry.lock index 8c578cb..1a6d59f 100644 --- a/poetry.lock +++ b/poetry.lock @@ -743,7 +743,7 @@ tox = ["tox"] [[package]] name = "enkanetwork.py" -version = "1.4.2" +version = "1.4.1" description = "Library for fetching JSON data from site https://enka.network/" category = "main" optional = false @@ -1062,34 +1062,6 @@ files = [ {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"}, ] -[[package]] -name = "h2" -version = "4.1.0" -description = "HTTP/2 State-Machine based protocol implementation" -category = "main" -optional = false -python-versions = ">=3.6.1" -files = [ - {file = "h2-4.1.0-py3-none-any.whl", hash = "sha256:03a46bcf682256c95b5fd9e9a99c1323584c3eec6440d379b9903d709476bc6d"}, - {file = "h2-4.1.0.tar.gz", hash = "sha256:a83aca08fbe7aacb79fec788c9c0bac936343560ed9ec18b82a13a12c28d2abb"}, -] - -[package.dependencies] -hpack = ">=4.0,<5" -hyperframe = ">=6.0,<7" - -[[package]] -name = "hpack" -version = "4.0.0" -description = "Pure-Python HPACK header compression" -category = "main" -optional = false -python-versions = ">=3.6.1" -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.16.3" @@ -1180,7 +1152,6 @@ files = [ [package.dependencies] certifi = "*" -h2 = {version = ">=3,<5", optional = true, markers = "extra == \"http2\""} httpcore = ">=0.15.0,<0.17.0" rfc3986 = {version = ">=1.3,<2", extras = ["idna2008"]} sniffio = "*" @@ -1191,18 +1162,6 @@ cli = ["click (>=8.0.0,<9.0.0)", "pygments (>=2.0.0,<3.0.0)", "rich (>=10,<13)"] http2 = ["h2 (>=3,<5)"] socks = ["socksio (>=1.0.0,<2.0.0)"] -[[package]] -name = "hyperframe" -version = "6.0.1" -description = "HTTP/2 framing layer for Python" -category = "main" -optional = false -python-versions = ">=3.6.1" -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.4" @@ -1722,19 +1681,19 @@ tests = ["check-manifest", "coverage", "defusedxml", "markdown2", "olefile", "pa [[package]] name = "platformdirs" -version = "3.1.1" +version = "3.2.0" description = "A small Python package for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "platformdirs-3.1.1-py3-none-any.whl", hash = "sha256:e5986afb596e4bb5bde29a79ac9061aa955b94fca2399b7aaac4090860920dd8"}, - {file = "platformdirs-3.1.1.tar.gz", hash = "sha256:024996549ee88ec1a9aa99ff7f8fc819bb59e2c3477b410d90a16d32d6e707aa"}, + {file = "platformdirs-3.2.0-py3-none-any.whl", hash = "sha256:ebe11c0d7a805086e99506aa331612429a72ca7cd52a1f0d277dc4adc20cb10e"}, + {file = "platformdirs-3.2.0.tar.gz", hash = "sha256:d5b638ca397f25f979350ff789db335903d7ea010ab28903f57b27e1b16c2b08"}, ] [package.extras] docs = ["furo (>=2022.12.7)", "proselint (>=0.13)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"] -test = ["appdirs (==1.4.4)", "covdefaults (>=2.2.2)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] +test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.2.2)", "pytest-cov (>=4)", "pytest-mock (>=3.10)"] [[package]] name = "playwright" @@ -1999,29 +1958,30 @@ cli = ["click (>=5.0)"] [[package]] name = "python-telegram-bot" -version = "20.1" +version = "20.2" description = "We have made you a wrapper you can't refuse" category = "main" optional = false python-versions = ">=3.7" files = [ - {file = "python-telegram-bot-20.1.tar.gz", hash = "sha256:f9caf2ce867926b31717e24f3f9341e619e7be128f6e892fad958c6053ef06e0"}, - {file = "python_telegram_bot-20.1-py3-none-any.whl", hash = "sha256:b5096cf726f02b66a4dd0260027c853ec86ffa30bf651b8ac88b1dc558950b7d"}, + {file = "python-telegram-bot-20.2.tar.gz", hash = "sha256:d0aa53e1f06d7cb7919cc0e2d6c81a02d968fc29921aeaa962edd1efb816a9bd"}, + {file = "python_telegram_bot-20.2-py3-none-any.whl", hash = "sha256:4d1d4b643ce158aa17a0987b84005eaf25fe0ce8b38fd234099594985611c198"}, ] [package.dependencies] aiolimiter = {version = ">=1.0.0,<1.1.0", optional = true, markers = "extra == \"ext\""} -APScheduler = {version = ">=3.10.0,<3.11.0", optional = true, markers = "extra == \"ext\""} +APScheduler = {version = ">=3.10.1,<3.11.0", optional = true, markers = "extra == \"ext\""} cachetools = {version = ">=5.3.0,<5.4.0", optional = true, markers = "extra == \"ext\""} -httpx = {version = ">=0.23.3,<0.24.0", extras = ["http2"]} +httpx = ">=0.23.3,<0.24.0" pytz = {version = ">=2018.6", optional = true, markers = "extra == \"ext\""} tornado = {version = ">=6.2,<7.0", optional = true, markers = "extra == \"ext\""} [package.extras] -all = ["APScheduler (>=3.10.0,<3.11.0)", "aiolimiter (>=1.0.0,<1.1.0)", "cachetools (>=5.3.0,<5.4.0)", "cryptography (>=39.0.1)", "httpx[socks]", "pytz (>=2018.6)", "tornado (>=6.2,<7.0)"] +all = ["APScheduler (>=3.10.1,<3.11.0)", "aiolimiter (>=1.0.0,<1.1.0)", "cachetools (>=5.3.0,<5.4.0)", "cryptography (>=39.0.1)", "httpx[http2]", "httpx[socks]", "pytz (>=2018.6)", "tornado (>=6.2,<7.0)"] callback-data = ["cachetools (>=5.3.0,<5.4.0)"] -ext = ["APScheduler (>=3.10.0,<3.11.0)", "aiolimiter (>=1.0.0,<1.1.0)", "cachetools (>=5.3.0,<5.4.0)", "pytz (>=2018.6)", "tornado (>=6.2,<7.0)"] -job-queue = ["APScheduler (>=3.10.0,<3.11.0)", "pytz (>=2018.6)"] +ext = ["APScheduler (>=3.10.1,<3.11.0)", "aiolimiter (>=1.0.0,<1.1.0)", "cachetools (>=5.3.0,<5.4.0)", "pytz (>=2018.6)", "tornado (>=6.2,<7.0)"] +http2 = ["httpx[http2]"] +job-queue = ["APScheduler (>=3.10.1,<3.11.0)", "pytz (>=2018.6)"] passport = ["cryptography (>=39.0.1)"] rate-limiter = ["aiolimiter (>=1.0.0,<1.1.0)"] socks = ["httpx[socks]"] @@ -2029,14 +1989,14 @@ webhooks = ["tornado (>=6.2,<7.0)"] [[package]] name = "pytz" -version = "2022.7.1" +version = "2023.2" description = "World timezone definitions, modern and historical" category = "main" optional = false python-versions = "*" files = [ - {file = "pytz-2022.7.1-py2.py3-none-any.whl", hash = "sha256:78f4f37d8198e0627c5f1143240bb0206b8691d8d7ac6d78fee88b78733f8c4a"}, - {file = "pytz-2022.7.1.tar.gz", hash = "sha256:01a0681c4b9684a28304615eba55d1ab31ae00bf68ec157ec3708a8182dbbcd0"}, + {file = "pytz-2023.2-py2.py3-none-any.whl", hash = "sha256:8a8baaf1e237175b02f5c751eea67168043a749c843989e2b3015aa1ad9db68b"}, + {file = "pytz-2023.2.tar.gz", hash = "sha256:a27dcf612c05d2ebde626f7d506555f10dfc815b3eddccfaadfc7d99b11c9a07"}, ] [[package]] @@ -2168,14 +2128,14 @@ idna2008 = ["idna"] [[package]] name = "rich" -version = "13.3.2" +version = "13.3.3" description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal" category = "main" optional = false python-versions = ">=3.7.0" files = [ - {file = "rich-13.3.2-py3-none-any.whl", hash = "sha256:a104f37270bf677148d8acb07d33be1569eeee87e2d1beb286a4e9113caf6f2f"}, - {file = "rich-13.3.2.tar.gz", hash = "sha256:91954fe80cfb7985727a467ca98a7618e5dd15178cc2da10f553b36a93859001"}, + {file = "rich-13.3.3-py3-none-any.whl", hash = "sha256:540c7d6d26a1178e8e8b37e9ba44573a3cd1464ff6348b99ee7061b95d1c6333"}, + {file = "rich-13.3.3.tar.gz", hash = "sha256:dc84400a9d842b3a9c5ff74addd8eb798d155f36c1c91303888e0a66850d2a15"}, ] [package.dependencies] @@ -2579,14 +2539,14 @@ files = [ [[package]] name = "tzdata" -version = "2022.7" +version = "2023.2" description = "Provider of IANA time zone data" category = "main" optional = false python-versions = ">=2" files = [ - {file = "tzdata-2022.7-py2.py3-none-any.whl", hash = "sha256:2b88858b0e3120792a3c0635c23daf36a7d7eeeca657c323da299d2094402a0d"}, - {file = "tzdata-2022.7.tar.gz", hash = "sha256:fe5f866eddd8b96e9fcba978f8e503c909b19ea7efda11e52e39494bad3a7bfa"}, + {file = "tzdata-2023.2-py2.py3-none-any.whl", hash = "sha256:905ae9e6744dd9ef5ce94d2aaa2dd00282fee38b670b2133407f23c388f110a1"}, + {file = "tzdata-2023.2.tar.gz", hash = "sha256:c3b51b235b07f9f1889089c2264bcbeaaba260a63f89bea09e350ea4205eb95f"}, ] [[package]] diff --git a/requirements.txt b/requirements.txt index acefb3d..94af132 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,7 +22,7 @@ charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "4.0" click==8.1.3 ; python_version >= "3.8" and python_version < "4.0" colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32" or python_version >= "3.8" and python_version < "4.0" and platform_system == "Windows" colorlog==6.7.0 ; python_version >= "3.8" and python_version < "4.0" -cryptography==39.0.2 ; python_version >= "3.8" and python_version < "4.0" +cryptography==40.0.1 ; python_version >= "3.8" and python_version < "4.0" enkanetwork-py @ git+https://github.com/mrwan200/EnkaNetwork.py@master ; python_version >= "3.8" and python_version < "4.0" et-xmlfile==1.1.0 ; python_version >= "3.8" and python_version < "4.0" exceptiongroup==1.1.1 ; python_version >= "3.8" and python_version < "3.11" @@ -35,13 +35,9 @@ gitdb==4.0.10 ; python_version >= "3.8" and python_version < "4.0" gitpython==3.1.31 ; python_version >= "3.8" and python_version < "4.0" greenlet==1.1.3 ; python_version >= "3.8" and python_version < "4.0" h11==0.14.0 ; python_version >= "3.8" and python_version < "4.0" -h2==4.1.0 ; python_version >= "3.8" and python_version < "4.0" -hpack==4.0.0 ; python_version >= "3.8" and python_version < "4.0" httpcore==0.16.3 ; python_version >= "3.8" and python_version < "4.0" httptools==0.5.0 ; python_version >= "3.8" and python_version < "4.0" httpx==0.23.3 ; python_version >= "3.8" and python_version < "4.0" -httpx[http2]==0.23.3 ; python_version >= "3.8" and python_version < "4.0" -hyperframe==6.0.1 ; python_version >= "3.8" and python_version < "4.0" idna==3.4 ; python_version >= "3.8" and python_version < "4.0" importlib-metadata==6.1.0 ; python_version >= "3.8" and python_version < "4.0" importlib-resources==5.12.0 ; python_version >= "3.8" and python_version < "3.9" @@ -58,7 +54,7 @@ openpyxl==3.1.2 ; python_version >= "3.8" and python_version < "4.0" packaging==23.0 ; python_version >= "3.8" and python_version < "4.0" pathspec==0.11.1 ; python_version >= "3.8" and python_version < "4.0" pillow==9.4.0 ; python_version >= "3.8" and python_version < "4.0" -platformdirs==3.1.1 ; python_version >= "3.8" and python_version < "4.0" +platformdirs==3.2.0 ; python_version >= "3.8" and python_version < "4.0" playwright==1.27.1 ; python_version >= "3.8" and python_version < "4.0" pluggy==1.0.0 ; python_version >= "3.8" and python_version < "4.0" pyaes==1.6.1 ; python_version >= "3.8" and python_version < "4.0" @@ -73,14 +69,14 @@ pysocks==1.7.1 ; python_version >= "3.8" and python_version < "4.0" pytest-asyncio==0.21.0 ; python_version >= "3.8" and python_version < "4.0" pytest==7.2.2 ; python_version >= "3.8" and python_version < "4.0" python-dotenv==1.0.0 ; python_version >= "3.8" and python_version < "4.0" -python-telegram-bot[ext,rate-limiter]==20.1 ; python_version >= "3.8" and python_version < "4.0" +python-telegram-bot[ext,rate-limiter]==20.2 ; python_version >= "3.8" and python_version < "4.0" pytz-deprecation-shim==0.1.0.post0 ; python_version >= "3.8" and python_version < "4.0" -pytz==2022.7.1 ; python_version >= "3.8" and python_version < "4.0" +pytz==2023.2 ; python_version >= "3.8" and python_version < "4.0" pyyaml==6.0 ; python_version >= "3.8" and python_version < "4.0" qrcode==7.4.2 ; python_version >= "3.8" and python_version < "4.0" redis==4.5.3 ; python_version >= "3.8" and python_version < "4.0" rfc3986[idna2008]==1.5.0 ; python_version >= "3.8" and python_version < "4.0" -rich==13.3.2 ; python_version >= "3.8" and python_version < "4.0" +rich==13.3.3 ; python_version >= "3.8" and python_version < "4.0" sentry-sdk==1.17.0 ; python_version >= "3.8" and python_version < "4.0" setuptools==67.6.0 ; python_version >= "3.8" and python_version < "4.0" six==1.16.0 ; python_version >= "3.8" and python_version < "4.0" @@ -98,7 +94,7 @@ tomli==2.0.1 ; python_version >= "3.8" and python_version < "3.11" tornado==6.2 ; python_version >= "3.8" and python_version < "4.0" tqdm==4.65.0 ; python_version >= "3.8" and python_version < "4.0" typing-extensions==4.5.0 ; python_version >= "3.8" and python_version < "4.0" -tzdata==2022.7 ; python_version >= "3.8" and python_version < "4.0" +tzdata==2023.2 ; python_version >= "3.8" and python_version < "4.0" tzlocal==4.3 ; python_version >= "3.8" and python_version < "4.0" ujson==5.7.0 ; python_version >= "3.8" and python_version < "4.0" urllib3==1.26.15 ; python_version >= "3.8" and python_version < "4.0"