diff --git a/poetry.lock b/poetry.lock index 0111cf34..3be58b7b 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4,13 +4,13 @@ description = "Async http client/server framework (asyncio)" name = "aiohttp" optional = false python-versions = ">=3.5.3" -version = "3.6.2" +version = "3.5.4" [package.dependencies] async-timeout = ">=3.0,<4.0" attrs = ">=17.3.0" chardet = ">=2.0,<4.0" -multidict = ">=4.5,<5.0" +multidict = ">=4.0,<5.0" yarl = ">=1.0,<2.0" [package.extras] @@ -130,26 +130,6 @@ pytz = "*" regex = "*" tzlocal = "*" -[[package]] -category = "main" -description = "A python wrapper for the Discord API" -name = "discord.py" -optional = false -python-versions = ">=3.5.3" -version = "1.3.0a2155+gf11fb25" - -[package.dependencies] -aiohttp = ">=3.6.0,<3.7.0" -websockets = ">=6.0,<7.0 || >7.0,<8.0 || >8.0,<8.0.1 || >8.0.1,<9.0" - -[package.extras] -docs = ["sphinx (1.8.5)", "sphinxcontrib_trio (1.1.0)", "sphinxcontrib-websupport"] -voice = ["PyNaCl (1.3.0)"] - -[package.source] -reference = "f11fb254f6a37c635e9056cb895de7904774ac22" -type = "git" -url = "https://github.com/Steffo99/discord.py" [[package]] category = "main" description = "Python bindings for FFmpeg - with complex filtering support" @@ -347,83 +327,78 @@ dev = ["coverage", "pre-commit", "pytest", "pytest-cov", "tox"] [[package]] category = "main" -description = "" +description = "A multipurpose bot and web framework" name = "royalnet" optional = false - python-versions = "^3.8" -version = "5.1a1" +python-versions = ">=3.8,<4.0" +version = "5.1.3" [package.dependencies] -dateparser = "^0.7.2" -toml = "^0.10.0" +dateparser = ">=0.7.2,<0.8.0" +toml = ">=0.10.0,<0.11.0" [package.dependencies.coloredlogs] optional = true -version = "^10.0" - -[package.dependencies."discord.py"] -optional = true -version = "branch master" +version = ">=10.0,<11.0" [package.dependencies.ffmpeg_python] optional = true -version = "~0.2.0" +version = ">=0.2.0,<0.3.0" [package.dependencies.psycopg2_binary] optional = true -version = "^2.8.4" +version = ">=2.8.4,<3.0.0" [package.dependencies.pynacl] optional = true -version = "^1.3.0" +version = ">=1.3.0,<2.0.0" [package.dependencies.python-multipart] optional = true -version = "^0.0.5" +version = ">=0.0.5,<0.0.6" [package.dependencies.python_telegram_bot] optional = true -version = "^12.2.0" +version = ">=12.2.0,<13.0.0" [package.dependencies.sentry_sdk] optional = true -version = "~0.13.2" +version = ">=0.13.2,<0.14.0" [package.dependencies.sqlalchemy] optional = true -version = "^1.3.10" +version = ">=1.3.10,<2.0.0" [package.dependencies.starlette] optional = true -version = "^0.12.13" +version = ">=0.12.13,<0.13.0" + +[package.dependencies.temp_discordpy_without_websockets_requirement] +optional = true +version = "0.1" [package.dependencies.uvicorn] optional = true -version = "^0.10.7" +version = ">=0.10.7,<0.11.0" [package.dependencies.websockets] optional = true -version = "^8.1" +version = ">=8.1,<9.0" [package.dependencies.youtube_dl] optional = true version = "*" [package.extras] -alchemy_easy = ["sqlalchemy (^1.3.10)", "psycopg2_binary (^2.8.4)"] -alchemy_hard = ["sqlalchemy (^1.3.10)", "psycopg2 (^2.8.4)"] -bard = ["ffmpeg_python (~0.2.0)", "youtube-dl"] -coloredlogs = ["coloredlogs (^10.0)"] -constellation = ["starlette (^0.12.13)", "uvicorn (^0.10.7)", "python-multipart (^0.0.5)"] -discord = ["discord.py", "pynacl (^1.3.0)"] -herald = ["websockets (^8.1)"] -sentry = ["sentry_sdk (~0.13.2)"] -telegram = ["python_telegram_bot (^12.2.0)"] - -[package.source] -reference = "d82b824a3447b6aef9e5d6997033852d53089127" -type = "git" - url = "https://github.com/Steffo99/royalnet/" +alchemy_easy = ["sqlalchemy (>=1.3.10,<2.0.0)", "psycopg2_binary (>=2.8.4,<3.0.0)"] +alchemy_hard = ["sqlalchemy (>=1.3.10,<2.0.0)", "psycopg2 (>=2.8.4,<3.0.0)"] +bard = ["ffmpeg_python (>=0.2.0,<0.3.0)", "youtube-dl"] +coloredlogs = ["coloredlogs (>=10.0,<11.0)"] +constellation = ["starlette (>=0.12.13,<0.13.0)", "uvicorn (>=0.10.7,<0.11.0)", "python-multipart (>=0.0.5,<0.0.6)"] +discord = ["temp_discordpy_without_websockets_requirement (0.1)", "pynacl (>=1.3.0,<2.0.0)"] +herald = ["websockets (>=8.1,<9.0)"] +sentry = ["sentry_sdk (>=0.13.2,<0.14.0)"] +telegram = ["python_telegram_bot (>=12.2.0,<13.0.0)"] [[package]] category = "main" @@ -498,6 +473,22 @@ version = "0.12.13" [package.extras] full = ["aiofiles", "graphene", "itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "ujson"] +[[package]] +category = "main" +description = "A python wrapper for the Discord API" +name = "temp-discordpy-without-websockets-requirement" +optional = false +python-versions = ">=3.5.3" +version = "0.1" + +[package.dependencies] +aiohttp = ">=3.3.0,<3.6.0" +websockets = ">=8.0" + +[package.extras] +docs = ["sphinx (1.8.5)", "sphinxcontrib-trio (1.1.0)", "sphinxcontrib-websupport"] +voice = ["PyNaCl (1.3.0)"] + [[package]] category = "main" description = "Python Library for Tom's Obvious, Minimal Language" @@ -591,23 +582,33 @@ python-versions = "*" version = "2019.11.28" [metadata] -content-hash = "be7ee7b683f3e789a759f25a03730bf98152e6c5f47219d9ee5030f8f66d9d6f" +content-hash = "ddf69be54b5c823955315ed4665db961006ed32c0168da55848bb049f1068d1c" python-versions = "^3.8" [metadata.files] aiohttp = [ - {file = "aiohttp-3.6.2-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:1e984191d1ec186881ffaed4581092ba04f7c61582a177b187d3a2f07ed9719e"}, - {file = "aiohttp-3.6.2-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:50aaad128e6ac62e7bf7bd1f0c0a24bc968a0c0590a726d5a955af193544bcec"}, - {file = "aiohttp-3.6.2-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:65f31b622af739a802ca6fd1a3076fd0ae523f8485c52924a89561ba10c49b48"}, - {file = "aiohttp-3.6.2-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:ae55bac364c405caa23a4f2d6cfecc6a0daada500274ffca4a9230e7129eac59"}, - {file = "aiohttp-3.6.2-cp36-cp36m-win32.whl", hash = "sha256:344c780466b73095a72c616fac5ea9c4665add7fc129f285fbdbca3cccf4612a"}, - {file = "aiohttp-3.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4c6efd824d44ae697814a2a85604d8e992b875462c6655da161ff18fd4f29f17"}, - {file = "aiohttp-3.6.2-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:2f4d1a4fdce595c947162333353d4a44952a724fba9ca3205a3df99a33d1307a"}, - {file = "aiohttp-3.6.2-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:6206a135d072f88da3e71cc501c59d5abffa9d0bb43269a6dcd28d66bfafdbdd"}, - {file = "aiohttp-3.6.2-cp37-cp37m-win32.whl", hash = "sha256:b778ce0c909a2653741cb4b1ac7015b5c130ab9c897611df43ae6a58523cb965"}, - {file = "aiohttp-3.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:32e5f3b7e511aa850829fbe5aa32eb455e5534eaa4b1ce93231d00e2f76e5654"}, - {file = "aiohttp-3.6.2-py3-none-any.whl", hash = "sha256:460bd4237d2dbecc3b5ed57e122992f60188afe46e7319116da5eb8a9dfedba4"}, - {file = "aiohttp-3.6.2.tar.gz", hash = "sha256:259ab809ff0727d0e834ac5e8a283dc5e3e0ecc30c4d80b3cd17a4139ce1f326"}, + {file = "aiohttp-3.5.4-cp35-cp35m-macosx_10_10_x86_64.whl", hash = "sha256:199f1d106e2b44b6dacdf6f9245493c7d716b01d0b7fbe1959318ba4dc64d1f5"}, + {file = "aiohttp-3.5.4-cp35-cp35m-macosx_10_11_x86_64.whl", hash = "sha256:0155af66de8c21b8dba4992aaeeabf55503caefae00067a3b1139f86d0ec50ed"}, + {file = "aiohttp-3.5.4-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:cc619d974c8c11fe84527e4b5e1c07238799a8c29ea1c1285149170524ba9303"}, + {file = "aiohttp-3.5.4-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:09654a9eca62d1bd6d64aa44db2498f60a5c1e0ac4750953fdd79d5c88955e10"}, + {file = "aiohttp-3.5.4-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:629102a193162e37102c50713e2e31dc9a2fe7ac5e481da83e5bb3c0cee700aa"}, + {file = "aiohttp-3.5.4-cp35-cp35m-win32.whl", hash = "sha256:acc89b29b5f4e2332d65cd1b7d10c609a75b88ef8925d487a611ca788432dfa4"}, + {file = "aiohttp-3.5.4-cp35-cp35m-win_amd64.whl", hash = "sha256:a25237abf327530d9561ef751eef9511ab56fd9431023ca6f4803f1994104d72"}, + {file = "aiohttp-3.5.4-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:87331d1d6810214085a50749160196391a712a13336cd02ce1c3ea3d05bcf8d5"}, + {file = "aiohttp-3.5.4-cp36-cp36m-macosx_10_11_x86_64.whl", hash = "sha256:a5cbd7157b0e383738b8e29d6e556fde8726823dae0e348952a61742b21aeb12"}, + {file = "aiohttp-3.5.4-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:9cddaff94c0135ee627213ac6ca6d05724bfe6e7a356e5e09ec57bd3249510f6"}, + {file = "aiohttp-3.5.4-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:d4392defd4648badaa42b3e101080ae3313e8f4787cb517efd3f5b8157eaefd6"}, + {file = "aiohttp-3.5.4-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:c2bec436a2b5dafe5eaeb297c03711074d46b6eb236d002c13c42f25c4a8ce9d"}, + {file = "aiohttp-3.5.4-cp36-cp36m-win32.whl", hash = "sha256:296f30dedc9f4b9e7a301e5cc963012264112d78a1d3094cd83ef148fdf33ca1"}, + {file = "aiohttp-3.5.4-cp36-cp36m-win_amd64.whl", hash = "sha256:9a02a04bbe581c8605ac423ba3a74999ec9d8bce7ae37977a3d38680f5780b6d"}, + {file = "aiohttp-3.5.4-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:b05bd85cc99b06740aad3629c2585bda7b83bd86e080b44ba47faf905fdf1300"}, + {file = "aiohttp-3.5.4-cp37-cp37m-macosx_10_11_x86_64.whl", hash = "sha256:40d7ea570b88db017c51392349cf99b7aefaaddd19d2c78368aeb0bddde9d390"}, + {file = "aiohttp-3.5.4-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:a97a516e02b726e089cffcde2eea0d3258450389bbac48cbe89e0f0b6e7b0366"}, + {file = "aiohttp-3.5.4-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:e1c3c582ee11af7f63a34a46f0448fca58e59889396ffdae1f482085061a2889"}, + {file = "aiohttp-3.5.4-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:00d198585474299c9c3b4f1d5de1a576cc230d562abc5e4a0e81d71a20a6ca55"}, + {file = "aiohttp-3.5.4-cp37-cp37m-win32.whl", hash = "sha256:6d5ec9b8948c3d957e75ea14d41e9330e1ac3fed24ec53766c780f82805140dc"}, + {file = "aiohttp-3.5.4-cp37-cp37m-win_amd64.whl", hash = "sha256:368ed312550bd663ce84dc4b032a962fcb3c7cae099dbbd48663afc305e3b939"}, + {file = "aiohttp-3.5.4.tar.gz", hash = "sha256:9c4c83f4fa1938377da32bc2d59379025ceeee8e24b89f72fcbccd8ca22dc9bf"}, ] async-timeout = [ {file = "async-timeout-3.0.1.tar.gz", hash = "sha256:0c3c816a028d47f659d6ff5c745cb2acf1f966da1fe5c19c77a70282b25f4c5f"}, @@ -699,7 +700,6 @@ dateparser = [ {file = "dateparser-0.7.2-py2.py3-none-any.whl", hash = "sha256:983d84b5e3861cb0aa240cad07f12899bb10b62328aae188b9007e04ce37d665"}, {file = "dateparser-0.7.2.tar.gz", hash = "sha256:e1eac8ef28de69a554d5fcdb60b172d526d61924b1a40afbbb08df459a36006b"}, ] -"discord.py" = [] ffmpeg-python = [ {file = "ffmpeg-python-0.2.0.tar.gz", hash = "sha256:65225db34627c578ef0e11c8b1eb528bb35e024752f6f10b78c011f6f64c4127"}, {file = "ffmpeg_python-0.2.0-py3-none-any.whl", hash = "sha256:ac441a0404e053f8b6a1113a77c0f452f1cfc62f6344a769475ffdc0f56c23c5"}, @@ -844,7 +844,10 @@ riotwatcher = [ {file = "riotwatcher-2.7.1-py2.py3-none-any.whl", hash = "sha256:3fb03b20f768cea7830d54c6d301a8341c67223625ac8536d26d1c140af3dcb0"}, {file = "riotwatcher-2.7.1.tar.gz", hash = "sha256:5349271c7e00637b7619491a6070e66603705db60558ea2a690e7016f6e6d9a4"}, ] -royalnet = [] +royalnet = [ + {file = "royalnet-5.1.3-py3-none-any.whl", hash = "sha256:b7164d06fad7f164f42cb3eea657faa62bce7af13213d69f61445f592af56349"}, + {file = "royalnet-5.1.3.tar.gz", hash = "sha256:9c3147122aae98555cee7352582360a9e8d48fc900f6a9aa0ef6b63823c04c59"}, +] royalspells = [ {file = "royalspells-3.2.tar.gz", hash = "sha256:2bd4a9a66514532e35c02c3907425af48c7cb292364c4843c795719a82b25dfe"}, ] @@ -862,6 +865,10 @@ sqlalchemy = [ starlette = [ {file = "starlette-0.12.13.tar.gz", hash = "sha256:9597bc28e3c4659107c1c4a45ec32dc45e947d78fe56230222be673b2c36454a"}, ] +temp-discordpy-without-websockets-requirement = [ + {file = "temp_discordpy_without_websockets_requirement-0.1-py3-none-any.whl", hash = "sha256:361ddcc6fb2ec469706fde56c46a3e14f02671cf0e27204ef6c3c4d89c7227ab"}, + {file = "temp_discordpy_without_websockets_requirement-0.1.tar.gz", hash = "sha256:7db02603cde084c7d579d872389f60ffd3f34197d885e4ca722a92bc302cb33c"}, +] toml = [ {file = "toml-0.10.0-py2.7.egg", hash = "sha256:f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"}, {file = "toml-0.10.0-py2.py3-none-any.whl", hash = "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e"}, diff --git a/pyproject.toml b/pyproject.toml index 9f8c358f..5773b7d5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,10 +2,10 @@ [tool.poetry] name = "royalpack" - version = "5.1a2" + version = "5.1.3" description = "A Royalnet command pack for the Royal Games community" authors = ["Stefano Pigozzi "] - license = "AGPL-3.0+" + license = "AGPL-3.0" readme = "README.md" homepage = "https://github.com/Steffo99/royalpack" documentation = "https://gh.steffo.eu/royalpack/" @@ -23,19 +23,7 @@ riotwatcher = "^2.7.1" royalspells = "^3.2" - [tool.poetry.dependencies.royalnet] - git = "https://github.com/Steffo99/royalnet/" - # Maybe... there is a way to make these selectable? - extras = [ - "telegram", - "discord", - "alchemy_easy", - "bard", - "constellation", - "sentry", - "herald", - "coloredlogs" - ] + royalnet = {version = "^5.1.2", extras = ["telegram", "discord", "alchemy_easy", "bard", "constellation", "sentry", "herald", "coloredlogs"]} # Development dependencies [tool.poetry.dev-dependencies] diff --git a/royalpack/commands/eat.py b/royalpack/commands/eat.py index 901f9278..9e5fabb1 100644 --- a/royalpack/commands/eat.py +++ b/royalpack/commands/eat.py @@ -48,6 +48,6 @@ class EatCommand(Command): } async def run(self, args: CommandArgs, data: CommandData) -> None: - food = args.joined(require_at_least=0) + food = args.joined(require_at_least=1) food_string = self._FOODS.get(food.lower(), self._FOODS["_default"]) await data.reply(food_string.format(food=food.capitalize())) diff --git a/royalpack/version.py b/royalpack/version.py index 6f0b0925..70cfc919 100644 --- a/royalpack/version.py +++ b/royalpack/version.py @@ -1 +1 @@ -semantic = "5.1a2" +semantic = "5.1.3"