From 2af9aecc12aef3adfa8b27f63017812629a60680 Mon Sep 17 00:00:00 2001 From: Steve Traylen Date: Thu, 30 Jan 2025 22:00:09 +0100 Subject: [PATCH] Allways pull in deps for working gql-cli As things stand: ``` $ pip3 install gql $ echo 'query { continent(code:"AF") { name } }' | gql-cli https://countries.trevorblades.com Traceback (most recent call last): File "/home/steve/tests/bin/gql-cli", line 8, in sys.exit(gql_cli()) ~~~~~~~^^ File "/home/steve/tests/lib64/python3.13/site-packages/gql/cli.py", line 534, in gql_cli exit_code = loop.run_until_complete(main_task) File "/usr/lib64/python3.13/asyncio/base_events.py", line 720, in run_until_complete return future.result() ~~~~~~~~~~~~~^^ File "/home/steve/tests/lib64/python3.13/site-packages/gql/cli.py", line 436, in main transport = get_transport(args) File "/home/steve/tests/lib64/python3.13/site-packages/gql/cli.py", line 323, in get_transport from gql.transport.aiohttp import AIOHTTPTransport File "/home/steve/tests/lib64/python3.13/site-packages/gql/transport/aiohttp.py", line 9, in import aiohttp ModuleNotFoundError: No module named 'aiohttp' ``` The aiohttp dependencies are really allways needed for CLI to work. This patch makes aiohttp an `install_require` rather than be required as an optional sub package. --- setup.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/setup.py b/setup.py index e41836a7..71c86fe2 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,8 @@ "yarl>=1.6,<2.0", "backoff>=1.11.1,<3.0", "anyio>=3.0,<5", + "aiohttp>=3.8.0,<4;python_version<='3.11'", + "aiohttp>=3.9.0b0,<4;python_version>'3.11'", ] console_scripts = [ @@ -37,11 +39,6 @@ "types-requests", ] + tests_requires -install_aiohttp_requires = [ - "aiohttp>=3.8.0,<4;python_version<='3.11'", - "aiohttp>=3.9.0b0,<4;python_version>'3.11'", -] - install_requests_requires = [ "requests>=2.26,<3", "requests_toolbelt>=1.0.0,<2", @@ -60,7 +57,7 @@ ] install_all_requires = ( - install_aiohttp_requires + install_requests_requires + install_httpx_requires + install_websockets_requires + install_botocore_requires + install_requests_requires + install_httpx_requires + install_websockets_requires + install_botocore_requires ) # Get version from __version__.py file @@ -103,7 +100,6 @@ "test": install_all_requires + tests_requires, "test_no_transport": tests_requires, "dev": install_all_requires + dev_requires, - "aiohttp": install_aiohttp_requires, "requests": install_requests_requires, "httpx": install_httpx_requires, "websockets": install_websockets_requires,