Merge branch 'main_260131_merge' into 'main'

feat：Upgrade dependencies to support Python versions 1.2.x-1.3.x

See merge request webull/webull-openapi-python-sdk!16

Author: 方佳

samples/__init__.py

@@ -1 +1 @@
-__version__ = '1.0.9'
+__version__ = '2.0.0'

samples/data/data_streaming_client.py

@@ -86,6 +86,4 @@ def my_subscribe_success_func(client, api_client, quotes_session_id):
     # data_streaming_client.register_payload_decoder(PAYLOAD_TYPE_TICK, TickDecoder())
 
     # the sync mode, blocking in current thread
-    data_streaming_client.connect_and_loop_forever()
-
-
+    data_streaming_client.connect_and_loop_forever()

setup.py

@@ -16,16 +16,33 @@
 
 requires = [
     "jmespath>=0.9.3,<1.0.0",
-    "cryptography>=2.6.0",
-    "cachetools==5.2.0",
-    "paho-mqtt==1.6.1",
-    "protobuf==4.21.12",
-    "grpcio==1.51.1",
-    "grpcio-tools==1.51.1"
+    "cachetools>=5.2.0,<6",
+    "paho-mqtt>=1.6.1,<2",
+    "urllib3>=2.0",
+    "requests>=2.31.0",
+    "six>=1.16.0",
+
+    # cryptography
+    "cryptography>=3.4,<42; python_version<'3.12'",
+    "cryptography>=41.0,<43; python_version>='3.12'",
+
+    # protobuf
+    "protobuf>=4.21.12,<5; python_version<'3.12'",
+    "protobuf>=4.25.0,<6; python_version>='3.12'",
+
+    # grpc
+    "grpcio>=1.51.1,<1.60; python_version<'3.12'",
+    "grpcio>=1.60.0,<1.70; python_version>='3.12'"
 ]
 
+extras_require = {
+    "dev": [
+        "grpcio-tools>=1.60,<1.70",
+    ]
+}
+
 setup_args = {
-    'python_requires':'>=3.8,<3.12',
+    'python_requires':'>=3.8,<3.14',
     'version': VERSION,
     'author': AUTHOR,
     'author_email': AUTHOR_EMAIL,

webull/__init__.py

@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '2.0.0'

webull/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.1.0'
+__version__ = '2.0.0'
 
 import logging
 

webull/core/auth/composer/default_signature_composer.py

@@ -42,8 +42,8 @@
 from webull.core.exception.exceptions import ClientException
 from webull.core.utils import common
 import webull.core.headers as hd
-from webull.core.vendored.six import iteritems
-from webull.core.vendored.six.moves.urllib.parse import quote
+from six import iteritems
+from six.moves.urllib.parse import quote
 import logging
 logger = logging.getLogger(__name__) 
 

webull/core/auth/signers/signer.py

@@ -40,7 +40,7 @@
 """
 
 from abc import ABCMeta, abstractmethod
-from webull.core.vendored.six import with_metaclass
+from six import with_metaclass
 
 class Signer(with_metaclass(ABCMeta, object)):
     @abstractmethod

webull/core/client.py

@@ -61,9 +61,9 @@
 from webull.core.retry.retry_condition import RetryCondition
 from webull.core.retry.retry_policy_context import RetryPolicyContext
 from webull.core.utils import common, validation
-from webull.core.vendored.requests import codes
-from webull.core.vendored.requests.structures import CaseInsensitiveDict
-from webull.core.vendored.requests.structures import OrderedDict
+from requests import codes
+from requests.structures import CaseInsensitiveDict
+from requests.structures import OrderedDict
 
 DEFAULT_READ_TIMEOUT = 10
 DEFAULT_CONNECTION_TIMEOUT = 5
@@ -187,7 +187,7 @@ def default_user_agent():
         default_agent['Python'] = platform.python_version()
         default_agent['Core'] = __import__('webull.core').__version__
         default_agent['python-requests'] = __import__(
-            'webull.core.vendored.requests.__version__', globals(), locals(),
+            'requests.__version__', globals(), locals(),
             ['vendored', 'requests', '__version__'], 0).__version__
 
         return CaseInsensitiveDict(default_agent)

webull/core/compat.py

@@ -40,7 +40,7 @@
 """
 
 import sys
-from webull.core.vendored import six
+import six
 
 if six.PY2:
     from base64 import encodestring as b64_encode_bytes

webull/core/http/response.py

@@ -41,10 +41,10 @@
 
 import os
 import logging
-from webull.core.vendored.requests import Request, Session
+from requests import Request, Session
 from webull.core.http.request import Request as HttpRequest
 from webull.core.http import protocol_type as PT
-from webull.core.vendored.requests import status_codes
+from requests import status_codes
 
 
 logger = logging.getLogger(__name__)