Skip to content

Commit

Permalink
setuptools and packaging now need to specifically added to requiremen…
Browse files Browse the repository at this point in the history
…ts.txt
  • Loading branch information
mpnowacki-reef committed Nov 24, 2023
1 parent 15db41e commit f40107c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 3 additions & 3 deletions b2sdk/version_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from abc import ABCMeta, abstractmethod
from functools import wraps

from pkg_resources import parse_version
from packaging.version import parse

from b2sdk.version import VERSION

Expand All @@ -28,7 +28,7 @@ def __init__(self, changed_version, cutoff_version=None, reason='', current_vers
"""
if current_version is None: # this is for tests only
current_version = VERSION # TODO autodetect by going up the qualname tree and trying getattr(part, '__version__')
self.current_version = parse_version(current_version) #: current version
self.current_version = parse(current_version) #: current version
self.reason = reason

self.changed_version = self._parse_if_not_none(
Expand All @@ -42,7 +42,7 @@ def __init__(self, changed_version, cutoff_version=None, reason='', current_vers
def _parse_if_not_none(cls, version):
if version is None:
return None
return parse_version(version)
return parse(version)

@abstractmethod
def __call__(self, func):
Expand Down
2 changes: 2 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ logfury>=1.0.1,<2.0.0
requests>=2.9.1,<3.0.0
tqdm>=4.5.0,<5.0.0
typing-extensions>=4.7.1; python_version < '3.12'
setuptools>=69.0
packaging>=23.0

0 comments on commit f40107c

Please sign in to comment.