From 58e461d7267245b06a91fb5554be47682333b268 Mon Sep 17 00:00:00 2001 From: eya46 <644310932@qq.com> Date: Fri, 26 Jan 2024 19:37:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +-- poetry.lock | 90 ++++++++++++++++++++++++++++---------------------- pyproject.toml | 8 ++--- 3 files changed, 56 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index c351bab..dfbcccf 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,6 @@ SakuraFrp管理插件 ## 依赖项 -- [nonebot2](https://github.com/nonebot/nonebot2) >=2.0.1 -- [plugin-alconna](https://github.com/nonebot/plugin-alconna) ^0.35.1 +- [nonebot2](https://github.com/nonebot/nonebot2) >=2.1.0 +- [plugin-alconna](https://github.com/nonebot/plugin-alconna) >=0.35.0,<=0.40.0 - httpx >=0.20.0,<1.0.0 \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index 5389343..d1bcf46 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,10 +1,9 @@ -# This file is automatically @generated by Poetry 1.4.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. [[package]] name = "anyio" version = "4.2.0" description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -27,7 +26,6 @@ trio = ["trio (>=0.23)"] name = "arclet-alconna" version = "1.7.42" description = "A High-performance, Generality, Humane Command Line Arguments Parser Library." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -47,7 +45,6 @@ full = ["arclet-alconna-tools (>=0.2.0)"] name = "arclet-alconna-tools" version = "0.6.11" description = "Builtin Tools for Alconna" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -63,7 +60,6 @@ nepattern = ">=0.5.15" name = "certifi" version = "2023.11.17" description = "Python package for providing Mozilla's CA Bundle." -category = "main" optional = false python-versions = ">=3.6" files = [ @@ -75,7 +71,6 @@ files = [ name = "colorama" version = "0.4.6" description = "Cross-platform colored terminal text." -category = "main" optional = false python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" files = [ @@ -87,7 +82,6 @@ files = [ name = "exceptiongroup" version = "1.2.0" description = "Backport of PEP 654 (exception groups)" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -102,7 +96,6 @@ test = ["pytest (>=6)"] name = "fleep" version = "1.0.1" description = "File format determination library" -category = "main" optional = false python-versions = ">=3.1" files = [ @@ -113,7 +106,6 @@ files = [ name = "h11" version = "0.14.0" description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -121,11 +113,36 @@ 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" +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" +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 = "1.0.2" description = "A minimal low-level HTTP client." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -140,14 +157,13 @@ h11 = ">=0.13,<0.15" [package.extras] asyncio = ["anyio (>=4.0,<5.0)"] http2 = ["h2 (>=3,<5)"] -socks = ["socksio (>=1.0.0,<2.0.0)"] +socks = ["socksio (==1.*)"] trio = ["trio (>=0.22.0,<0.23.0)"] [[package]] name = "httpx" version = "0.26.0" description = "The next generation HTTP client." -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -158,21 +174,32 @@ files = [ [package.dependencies] anyio = "*" certifi = "*" -httpcore = ">=1.0.0,<2.0.0" +h2 = {version = ">=3,<5", optional = true, markers = "extra == \"http2\""} +httpcore = "==1.*" idna = "*" sniffio = "*" [package.extras] brotli = ["brotli", "brotlicffi"] -cli = ["click (>=8.0.0,<9.0.0)", "pygments (>=2.0.0,<3.0.0)", "rich (>=10,<14)"] +cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"] http2 = ["h2 (>=3,<5)"] -socks = ["socksio (>=1.0.0,<2.0.0)"] +socks = ["socksio (==1.*)"] + +[[package]] +name = "hyperframe" +version = "6.0.1" +description = "HTTP/2 framing layer for Python" +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.6" description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -184,7 +211,6 @@ files = [ name = "loguru" version = "0.7.2" description = "Python logging made (stupidly) simple" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -203,7 +229,6 @@ dev = ["Sphinx (==7.2.5)", "colorama (==0.4.5)", "colorama (==0.4.6)", "exceptio name = "multidict" version = "6.0.4" description = "multidict implementation" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -287,7 +312,6 @@ files = [ name = "nepattern" version = "0.5.15" description = "a complex pattern, support typing" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -301,14 +325,13 @@ typing-extensions = ">=4.5.0" [[package]] name = "nonebot-plugin-alconna" -version = "0.35.1" +version = "0.36.0" description = "Alconna Adapter for Nonebot" -category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "nonebot_plugin_alconna-0.35.1-py3-none-any.whl", hash = "sha256:70dd86b477642dc1d154aef1ceb142e5350475852f87f4b3413dfc0c7d929d87"}, - {file = "nonebot_plugin_alconna-0.35.1.tar.gz", hash = "sha256:0940af2ddfd8cedde59123b2e3dc77aacb4efab1751d9744091d6baa69920e94"}, + {file = "nonebot_plugin_alconna-0.36.0-py3-none-any.whl", hash = "sha256:37f8afc272924802fe75146df5f68b44e8e5537420cbb983d2d9d65195e625e7"}, + {file = "nonebot_plugin_alconna-0.36.0.tar.gz", hash = "sha256:e524fac76ee0f1a08817007e649c2b491b44094e0262a3d36fcef3e1259edfa2"}, ] [package.dependencies] @@ -322,7 +345,6 @@ nonebot2 = ">=2.1.0" name = "nonebot2" version = "2.1.3" description = "An asynchronous python bot framework." -category = "main" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -331,6 +353,7 @@ files = [ ] [package.dependencies] +httpx = {version = ">=0.20.0,<1.0.0", extras = ["http2"], optional = true, markers = "extra == \"httpx\" or extra == \"all\""} loguru = ">=0.6.0,<1.0.0" pydantic = {version = ">=1.10.0,<2.0.0", extras = ["dotenv"]} pygtrie = ">=2.4.1,<3.0.0" @@ -350,7 +373,6 @@ websockets = ["websockets (>=10.0)"] name = "openapi-pydantic" version = "0.4.0" description = "Pydantic OpenAPI schema implementation" -category = "dev" optional = false python-versions = ">=3.8,<4.0" files = [ @@ -365,7 +387,6 @@ pydantic = ">=1.8" name = "pydantic" version = "1.10.14" description = "Data validation and settings management using python type hints" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -419,7 +440,6 @@ email = ["email-validator (>=1.0.3)"] name = "pygtrie" version = "2.5.0" description = "A pure Python trie data structure implementation." -category = "main" optional = false python-versions = "*" files = [ @@ -429,14 +449,13 @@ files = [ [[package]] name = "python-dotenv" -version = "1.0.0" +version = "1.0.1" description = "Read key-value pairs from a .env file and set them as environment variables" -category = "main" optional = false python-versions = ">=3.8" files = [ - {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"}, - {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"}, + {file = "python-dotenv-1.0.1.tar.gz", hash = "sha256:e324ee90a023d808f1959c46bcbc04446a10ced277783dc6ee09987c37ec10ca"}, + {file = "python_dotenv-1.0.1-py3-none-any.whl", hash = "sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a"}, ] [package.extras] @@ -446,7 +465,6 @@ cli = ["click (>=5.0)"] name = "pyyaml" version = "6.0.1" description = "YAML parser and emitter for Python" -category = "dev" optional = false python-versions = ">=3.6" files = [ @@ -496,7 +514,6 @@ files = [ name = "sniffio" version = "1.3.0" description = "Sniff out which async library your code is running under" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -508,7 +525,6 @@ files = [ name = "tarina" version = "0.4.2" description = "A collection of common utils for Arclet" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -559,7 +575,6 @@ typing-extensions = ">=4.4.0" name = "tomli" version = "2.0.1" description = "A lil' TOML parser" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -571,7 +586,6 @@ files = [ name = "typing-extensions" version = "4.9.0" description = "Backported and Experimental Type Hints for Python 3.8+" -category = "main" optional = false python-versions = ">=3.8" files = [ @@ -583,7 +597,6 @@ files = [ name = "win32-setctime" version = "1.1.0" description = "A small Python utility to set file creation time on Windows" -category = "main" optional = false python-versions = ">=3.5" files = [ @@ -598,7 +611,6 @@ dev = ["black (>=19.3b0)", "pytest (>=4.6.2)"] name = "yarl" version = "1.9.4" description = "Yet another URL library" -category = "main" optional = false python-versions = ">=3.7" files = [ @@ -701,4 +713,4 @@ multidict = ">=4.0" [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "d2a031f15e304b1b8d5075deee56877ffd1cb0a87dd6995cd1b2b0862df1b883" +content-hash = "1c571f27dd604b74700fc39f4765ffbfc8492b69e9155cc4122f8e9b0288b466" diff --git a/pyproject.toml b/pyproject.toml index c737a55..c00ddb5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "nonebot-plugin-enatfrp" -version = "0.1.4" +version = "0.1.5" description = "SakuraFrp管理插件" authors = ["eya46 <61458340+eya46@users.noreply.github.com>"] license = "MIT" @@ -9,14 +9,12 @@ packages = [{ include = "nonebot_plugin_enatfrp" }] [tool.poetry.dependencies] python = "^3.8" -nonebot2 = ">=2.0.1" -nonebot-plugin-alconna = "^0.35.1" -httpx = ">=0.20.0,<1.0.0" +nonebot2 = {version = ">=2.1.0", extras = ["httpx"]} +nonebot-plugin-alconna = ">=0.35.0,<=0.40.0" [tool.poetry.group.dev.dependencies] pyyaml = "^6.0.1" openapi-pydantic = "^0.4.0" -httpx = ">=0.20.0,<1.0.0" [build-system] requires = ["poetry-core"]