From 8e9f2587aea52c1d0a5c07d5f9bb77a23ae4d4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?= Date: Tue, 23 May 2023 10:40:02 +0100 Subject: [PATCH] Avoid conflicts with dependencies versions (bsc#1211612) (#581) This commit fixes the Salt requirements file that are used to generate the "requires.txt" file that is included in Salt egginfo in order to be consistent with the installed packages of Salt dependencies. This prevents issues when resolving and validating Salt dependencies with "pkg_resources" Python module. --- requirements/base.txt | 2 +- requirements/zeromq.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index c19d8804a2..437aa01d31 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,7 +6,7 @@ MarkupSafe requests>=1.0.0 distro>=1.0.1 psutil>=5.0.0 -packaging>=21.3 +packaging>=17.1 looseversion # We need contextvars for salt-ssh contextvars diff --git a/requirements/zeromq.txt b/requirements/zeromq.txt index 1e9a815c1b..23d1ef25dc 100644 --- a/requirements/zeromq.txt +++ b/requirements/zeromq.txt @@ -1,5 +1,5 @@ -r base.txt -r crypto.txt -pyzmq>=20.0.0 +pyzmq>=17.1.2 pyzmq==25.0.2 ; sys_platform == "win32" -- 2.39.2