Feat(bkmk_rrequests): Install socks dependency

diff --git a/bkmk_db-venv b/bkmk_db-venv
index 6b8f65e2f76e083d6bca284fa38599f24f5529d0..085c919656313098db1c0cb1d0171265a4ccb408 100644 (file)
--- a/bkmk_db-venv
+++ b/bkmk_db-venv
@@ -8,7 +8,7 @@ if [ -z "$VIRTUAL_ENV" ]; then
          } &&
          . bkmk_db-venv/bin/activate &&
          pip install --compile --upgrade beautifulsoup4 lxml m_lib.full \
-         requests requests-ftp \
+         "requests[socks]" requests-ftp \
          pycurl certifi \
          aiohttp aioftp
     }

diff --git a/doc/ANNOUNCE b/doc/ANNOUNCE
index bb7b34a85f5d337b937147142b2569d5fda108f9..fe8cf6175beca6759c26c2f00bc3f45565d201ba 100644 (file)
--- a/doc/ANNOUNCE
+++ b/doc/ANNOUNCE
@@ -13,6 +13,11 @@ Version 5.5.1 (2024-08-??)
 
    Do not route ftp requests via http(s) proxy; socks5 proxies are ok.
 
+   Install socks dependency for python-requests.
+
+   Default list of robots is now curl,requests,aiohttp,forking;
+   aiohttp doesn't properly work with SOCKS5 proxies.
+
 Version 5.5.0 (2024-08-06)
 
    Robot based on aiohttp.

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0d40430f3197720ba554430eaf65669151dafe65..47013f526bf298937319aea0cdeb0b1c373313cb 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -4,6 +4,11 @@ Version 5.5.1 (2024-08-??)
 
    Do not route ftp requests via http(s) proxy; socks5 proxies are ok.
 
+   Install socks dependency for python-requests.
+
+   Default list of robots is now curl,requests,aiohttp,forking;
+   aiohttp doesn't properly work with SOCKS5 proxies.
+
 Version 5.5.0 (2024-08-06)
 
    Robot based on aiohttp.

diff --git a/robots.py b/robots.py
index 06ce1fecac127b96fff6fd6fb4c3654df4da9973..d509a2fcc94405cda18d2a80c0b0d69c3869dc2c 100644 (file)
--- a/robots.py
+++ b/robots.py
@@ -16,7 +16,7 @@ from os import environ
 from bkmk_objects import parse_params, set_params
 
 robot_names, robot_params = parse_params(
-    environ.get("BKMK_ROBOT", "aiohttp,curl,requests,forking"))
+    environ.get("BKMK_ROBOT", "curl,requests,aiohttp,forking"))
 
 
 def import_robot(robot_name):

diff --git a/setup.py b/setup.py
index f6f6e017253f1cf60d028e3337e86052a66e2cac..d6043837fa50a807eff4eec99445511834c6b0b2 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -39,7 +39,7 @@ setup(
     ],
     extras_require={
         'html': ['beautifulsoup4', 'lxml'],
-        'requests': ['requests', 'requests-ftp'],
+        'requests': ['requests[socks]', 'requests-ftp'],
         'curl': ['pycurl', 'certifi'],
         'aiohttp:python_version>="3.4"': ['aiohttp', 'aioftp'],
     },