Feat(bkmk_raiohttp): Use siosocks for aioftp

diff --git a/bkmk_db-venv b/bkmk_db-venv
index 412c901b8c675f2c531628f84e489c0c82186c91..7d68291034e73dc6397dbed54f81adbc4fe0c69f 100644 (file)
--- a/bkmk_db-venv
+++ b/bkmk_db-venv
@@ -10,6 +10,6 @@ if [ -z "$VIRTUAL_ENV" ]; then
          pip install --compile --upgrade beautifulsoup4 lxml m_lib.full \
          "requests[socks]" \
          pycurl certifi \
-         aiohttp aiohttp-socks aioftp
+         aiohttp aiohttp-socks "aioftp[socks]"
     }
 fi

diff --git a/doc/ANNOUNCE b/doc/ANNOUNCE
index fa643b4c2584852e66222ea47a314e71825995bd..8a160977378bd454dce30353f2da2df00839be8d 100644 (file)
--- a/doc/ANNOUNCE
+++ b/doc/ANNOUNCE
@@ -13,7 +13,7 @@ Version 5.7.0 (2024-??-??)
 
    Robots: Removed connect_timeout, added ftp_timeout.
 
-   Robot bkmk_raiohttp: Use aiohttp-socks.
+   Robot bkmk_raiohttp: Use aiohttp-socks for aiohttp, siosocks for aioftp.
 
 Version 5.6.1 (2024-08-15)
 

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0fe15634c1caea6b41786ce670646058daa2a184..f093b0e8a89fb43cf7c89e519791c536e0860fda 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -4,7 +4,7 @@ Version 5.7.0 (2024-??-??)
 
    Robots: Removed connect_timeout, added ftp_timeout.
 
-   Robot bkmk_raiohttp: Use aiohttp-socks.
+   Robot bkmk_raiohttp: Use aiohttp-socks for aiohttp, siosocks for aioftp.
 
 Version 5.6.1 (2024-08-15)
 

diff --git a/setup.py b/setup.py
index 1e81b473ae0d2ac77dcf8b0fa7a20989eda70271..0e90608c328cfbd9adc71d06bf1b70acd6364f56 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup
 
 setup(
     name='bookmarks_db',
-    version='5.6.1',
+    version='5.7.0',
     description='Bookmarks database and Internet robot',
     long_description=open('README', 'r').read(),
     long_description_content_type="text/plain",
@@ -22,7 +22,6 @@ setup(
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
@@ -31,7 +30,7 @@ setup(
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
     ],
-    python_requires='>=3.5.3',
+    python_requires='>=3.6',
     install_requires=[
         'm_lib.full>=1.0',
     ],
@@ -39,6 +38,6 @@ setup(
         'html': ['beautifulsoup4', 'lxml'],
         'requests': ['requests[socks]'],
         'curl': ['pycurl', 'certifi'],
-        'aiohttp': ['aiohttp>=2.3.2', 'aiohttp-socks', 'aioftp'],
+        'aiohttp': ['aiohttp>=2.3.2', 'aiohttp-socks', 'aioftp[socks]'],
     },
 )