diff --git a/cryptoxlib/version_conversions.py b/cryptoxlib/version_conversions.py index 6285e15..526da66 100644 --- a/cryptoxlib/version_conversions.py +++ b/cryptoxlib/version_conversions.py @@ -3,42 +3,37 @@ import time -def is_python_version(major: int, minor: int, micro: int = None): +def get_compatible_version(): python_version = sys.version_info - if python_version.major == major and python_version.minor == minor: - if micro is not None: - return python_version.micro == micro - else: - return True + if python_version.major == 3 and python_version.minor == 6: + return True, False + elif python_version.major == 3 and python_version.minor > 6: + return False,True else: - return False + return False, False - -IS_PYTHON36 = is_python_version(3, 6) -IS_PYTHON37 = is_python_version(3, 7) -IS_PYTHON38 = is_python_version(3, 8) -IS_PYTHON39 = is_python_version(3, 9) -IS_PYTHON310 = is_python_version(3, 10) + +IS_PYTHON36, IS_PYTHON37_UP = get_compatible_version() def async_run(f): if IS_PYTHON36: loop = asyncio.get_event_loop() return loop.run_until_complete(f) - elif IS_PYTHON37 or IS_PYTHON38 or IS_PYTHON39 or IS_PYTHON310: + elif IS_PYTHON37_UP: return asyncio.run(f) - raise Exception(f'Unsupported Python version! Only versions 3.6.x, 3.7.x, 3.8.x, 3.9.x and 3.10.x are supported.') + raise Exception(f'Unsupported Python version! Only versions 3.6+ are supported.') def async_create_task(f): if IS_PYTHON36: loop = asyncio.get_event_loop() return loop.create_task(f) - elif IS_PYTHON37 or IS_PYTHON38 or IS_PYTHON39 or IS_PYTHON310: + elif IS_PYTHON37_UP: return asyncio.create_task(f) - raise Exception(f'Unsupported Python version! Only versions 3.6.x, 3.8.x, 3.9.x and 3.10.x are supported.') + raise Exception(f'Unsupported Python version! Only versions 3.6+ are supported.') def get_current_time_ms(): diff --git a/requirements.txt b/requirements.txt index 1f69393..9a29d88 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -aiohttp==3.9.3 +aiohttp==3.9.* websockets==9.1 -PyJWT==2.8.0 -pytz==2024.1 +PyJWT==2.8.* +pytz #==2024.1 diff --git a/requirements_test.txt b/requirements_test.txt index 4d1706a..1d73f99 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,2 +1,2 @@ -aiounittest==1.4.2 -pytest==7.4.4 +aiounittest==1.4.* +pytest==7.4.* diff --git a/setup.py b/setup.py index 488549f..e3319ca 100644 --- a/setup.py +++ b/setup.py @@ -27,6 +27,8 @@ "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "License :: OSI Approved :: MIT License", "Operating System :: OS Independent", "Topic :: Software Development :: Libraries",