This is an automated email from the git hooks/post-receive script.
nickm pushed a commit to branch main in repository trunnel.
The following commit(s) were added to refs/heads/main by this push: new 183adbf Remove distutils usage, it is deprecated 183adbf is described below
commit 183adbfb3f50f308ea6f4bde50ef934434a323e5 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Jan 11 12:11:52 2023 -0500
Remove distutils usage, it is deprecated
Signed-off-by: David Goulet dgoulet@torproject.org --- lib/trunnel/__main__.py | 4 ++-- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/trunnel/__main__.py b/lib/trunnel/__main__.py index f232544..c2eea9a 100644 --- a/lib/trunnel/__main__.py +++ b/lib/trunnel/__main__.py @@ -30,9 +30,9 @@ if __name__ == '__main__':
if need_version is not None: try: - from distutils.version import LooseVersion + from packaging.version import parse me, it = trunnel.__version__, need_version - if LooseVersion(me) < LooseVersion(it): + if parse(me) < parse(it): sys.stderr.write("I'm %s; you asked for %s\n" % (me, it)) sys.exit(1) except ImportError: diff --git a/setup.py b/setup.py index 8b79933..2a0a533 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,10 @@
-from distutils.core import setup +import setuptools
namespace = {} exec(open("./lib/trunnel/__init__.py").read(), namespace)
-setup(name='Trunnel', +setuptools.setup(name='Trunnel', version=namespace['__version__'], description='Trunnel binary format parser', author='Nick Mathewson',
tor-commits@lists.torproject.org