Post 2.17 requests declares urllib3 a normal dep

Author: bjester

morango/sync/session.py

@@ -1,11 +1,11 @@
 import logging
 
 from requests import exceptions
-from morango import __version__
 from requests.sessions import Session
 from requests.utils import super_len
-from requests.packages.urllib3.util.url import parse_url
+from urllib3.util.url import parse_url
 
+from morango import __version__
 from morango.utils import serialize_capabilities_to_client_request
 from morango.utils import SETTINGS
 

morango/sync/syncsession.py

@@ -10,11 +10,12 @@
 from urllib.parse import urljoin
 from urllib.parse import urlparse
 
+from django.db import connection
+from django.db import transaction
 from django.utils import timezone
 from requests.adapters import HTTPAdapter
 from requests.exceptions import HTTPError
-from requests.packages.urllib3.util.retry import Retry
-from django.db import transaction, connection
+from urllib3.util.retry import Retry
 
 from .session import SessionWrapper
 from morango.api.serializers import CertificateSerializer
@@ -38,11 +39,11 @@
 from morango.sync.context import LocalSessionContext
 from morango.sync.context import NetworkSessionContext
 from morango.sync.controller import SessionController
+from morango.sync.utils import lock_partitions
 from morango.sync.utils import SyncSignal
 from morango.sync.utils import SyncSignalGroup
 from morango.utils import CAPABILITIES
 from morango.utils import pid_exists
-from morango.sync.utils import lock_partitions
 
 if GZIP_BUFFER_POST in CAPABILITIES:
     from gzip import GzipFile

setup.py

@@ -28,7 +28,8 @@
         "rsa<4.10",
         "djangorestframework>3.10",
         "django-ipware==4.0.2",
-        "requests",
+        "requests>=2.27.1",
+        "urllib3>=1.26.0",
         "ifcfg",
     ],
     license="MIT",