From 1b5effa4158f04be1b5b9a5ea4fcfb03602fcb3f Mon Sep 17 00:00:00 2001
From: Oleg Broytman <phd@phdru.name>
Date: Fri, 16 Aug 2024 16:21:51 +0300
Subject: [PATCH] Feat(bkmk_raiohttp): Use siosocks for aioftp

---
 bkmk_db-venv  | 2 +-
 doc/ANNOUNCE  | 2 +-
 doc/ChangeLog | 2 +-
 setup.py      | 7 +++----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/bkmk_db-venv b/bkmk_db-venv
index 412c901..7d68291 100644
--- 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 fa643b4..8a16097 100644
--- 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 0fe1563..f093b0e 100644
--- 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 1e81b47..0e90608 100755
--- 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]'],
     },
 )
-- 
2.39.5