Skip to content

Commit fd058e8

Browse files
authored
Merge pull request #44 from Moesif/fix-py313-dependency
CS-115 Refactor: Fix breaking dependency depreciations starting python 3.10
2 parents adf6a14 + 562abc5 commit fd058e8

5 files changed

Lines changed: 12 additions & 3 deletions

File tree

MANIFEST.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
include VERSION
2+
13
# Include the license file
24
include LICENSE
35
include README.md

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.7
1+
1.1.8

moesifasgi/middleware.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616
from moesifapi.parse_body import ParseBody
1717
from starlette.types import Message
1818
from importlib.metadata import version
19-
from distutils.version import LooseVersion
19+
try:
20+
from packaging.version import Version as LooseVersion
21+
except ImportError:
22+
try:
23+
from distutils.version import LooseVersion
24+
except ImportError as e:
25+
raise ImportError("Neither 'packaging' nor 'distutils' is available. ") from e
2026
import math
2127
import random
2228
import logging

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ nose>=1.3.7
22
moesifapi>=1.5.5
33
moesifpythonrequest>=0.3.4
44
starlette>=0.16.0
5+
packaging

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def read_version(filepath="VERSION"):
5959
],
6060
keywords='log analysis restful api development debug asgi fastapi http middleware',
6161
packages=find_packages(exclude=['contrib', 'docs', 'tests']),
62-
install_requires=['starlette>=0.16.0', 'moesifapi>=1.5.5', 'moesifpythonrequest>=0.3.4'],
62+
install_requires=['starlette>=0.16.0', 'moesifapi>=1.5.5', 'moesifpythonrequest>=0.3.4', 'packaging'],
6363
extras_require={
6464
'dev': [],
6565
'test': ['nose'],

0 commit comments

Comments
 (0)