Import from packaging directly, add to requirements (#6374)

microsoft · Jul 18, 2024 · 7e3b3b9 · 7e3b3b9
1 parent a80c081
commit 7e3b3b9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/python/ccf/_versionifier.py b/python/ccf/_versionifier.py
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the Apache 2.0 License.
 
-from setuptools.extern.packaging.version import (  # type: ignore
+from packaging.version import (  # type: ignore
     Version,
     InvalidVersion,
 )

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,4 +1,6 @@
 loguru >= 0.5, == 0.*
 cryptography == 42.*
 string-color >= 1.2.1, == 1.*
-pycose >= 1.0.1, == 1.*
+pycose >= 1.0.1, == 1.*
+setuptools == 58.*
+packaging == 24.*
diff --git a/tests/infra/github.py b/tests/infra/github.py
@@ -10,7 +10,7 @@
 import shutil
 import requests
 
-from setuptools.extern.packaging.version import Version  # type: ignore
+from packaging.version import Version  # type: ignore
 
 from loguru import logger as LOG
 

diff --git a/tests/infra/node.py b/tests/infra/node.py
@@ -24,7 +24,7 @@
 
 import ccf._versionifier
 
-from setuptools.extern.packaging.version import Version  # type: ignore
+from packaging.version import Version  # type: ignore
 
 from loguru import logger as LOG
 

diff --git a/tests/infra/remote.py b/tests/infra/remote.py
@@ -16,7 +16,7 @@
 import json
 import infra.snp as snp
 import ccf._versionifier
-from setuptools.extern.packaging.version import (  # type: ignore
+from packaging.version import (  # type: ignore
     Version,
 )