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

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,
 )

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.*

tests/infra/github.py

@@ -10,7 +10,7 @@ import urllib
 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
 

tests/infra/node.py

@@ -24,7 +24,7 @@ import http
 
 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
 

tests/infra/remote.py

@@ -16,7 +16,7 @@ from jinja2 import Environment, FileSystemLoader, select_autoescape
 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,
 )