From 7e3b3b9538d22abc792ef6ddcbff82924b243e18 Mon Sep 17 00:00:00 2001
From: Amaury Chamayou <amchamay@microsoft.com>
Date: Thu, 18 Jul 2024 14:01:43 +0100
Subject: [PATCH] Import from packaging directly, add to requirements (#6374)

---
 python/ccf/_versionifier.py | 2 +-
 python/requirements.txt     | 4 +++-
 tests/infra/github.py       | 2 +-
 tests/infra/node.py         | 2 +-
 tests/infra/remote.py       | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/python/ccf/_versionifier.py b/python/ccf/_versionifier.py
index cf6b5cb2a..7f19870e4 100644
--- 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
index f1522d39f..935a3a5cf 100644
--- 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.*
\ No newline at end of file
+pycose >= 1.0.1, == 1.*
+setuptools == 58.*
+packaging == 24.*
diff --git a/tests/infra/github.py b/tests/infra/github.py
index 1c65c404a..40a630da3 100644
--- a/tests/infra/github.py
+++ b/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
 
diff --git a/tests/infra/node.py b/tests/infra/node.py
index ebf602285..696789eea 100644
--- a/tests/infra/node.py
+++ b/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
 
diff --git a/tests/infra/remote.py b/tests/infra/remote.py
index 09fa98bef..14aad26f1 100644
--- a/tests/infra/remote.py
+++ b/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,
 )