From 87f473a6381debc5cbcbfb0b8138f5c937dc9c2e Mon Sep 17 00:00:00 2001 From: Alexandru Dan Duna Date: Thu, 23 Jul 2026 15:17:45 +0300 Subject: [PATCH 1/4] Touch comment to trigger workflows --- salt/cli/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/cli/__init__.py b/salt/cli/__init__.py index 045f00f5b6aa..9d1244297d78 100644 --- a/salt/cli/__init__.py +++ b/salt/cli/__init__.py @@ -1,3 +1,3 @@ """ -The management of salt command line utilities are stored in here +The management of salt command line utilities are stored in here. """ From 25befb337971208b53d7fa4ff1779900419d49a0 Mon Sep 17 00:00:00 2001 From: Alexandru Dan Duna Date: Thu, 23 Jul 2026 15:55:02 +0300 Subject: [PATCH 2/4] Add cffi constraint to requirements, to fix conflict with setuptools constraint --- requirements/constraints.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 36f27fee7392..4ad4ad5ca6c1 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1,5 +1,6 @@ wheel <= 0.45.1 setuptools >= 65.6.3,< 69.0 +cffi<2.1.0 # newer versions require setuptools>=77.0.3, which conflicts with setuptools constraint setuptools-scm < 8.0.0 pip >= 23.3,< 24.0 ; python_version < '3.12' pip >24 ; python_version >= '3.12' From e93bde9250a01bebd96066347b263564911fb91e Mon Sep 17 00:00:00 2001 From: Alexandru Dan Duna Date: Thu, 23 Jul 2026 16:17:45 +0300 Subject: [PATCH 3/4] Restrict cffi to <2.0.0 --- requirements/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 4ad4ad5ca6c1..b4826e6bec7b 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1,6 +1,6 @@ wheel <= 0.45.1 setuptools >= 65.6.3,< 69.0 -cffi<2.1.0 # newer versions require setuptools>=77.0.3, which conflicts with setuptools constraint +cffi<2.0.0 # newer versions require newer setuptools, which conflicts with setuptools constraint setuptools-scm < 8.0.0 pip >= 23.3,< 24.0 ; python_version < '3.12' pip >24 ; python_version >= '3.12' From 574983612d6c249b72510ece4222d8d9ab700671 Mon Sep 17 00:00:00 2001 From: Alexandru Dan Duna Date: Fri, 24 Jul 2026 10:15:47 +0300 Subject: [PATCH 4/4] Constraint pycparser to <3.0.0 to fix setuptools conflicts --- requirements/constraints.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index b4826e6bec7b..a1763d0135f4 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -1,6 +1,7 @@ wheel <= 0.45.1 setuptools >= 65.6.3,< 69.0 cffi<2.0.0 # newer versions require newer setuptools, which conflicts with setuptools constraint +pycparser<3.0.0 # newer versions require newer setuptools, which conflicts with setuptools constraint setuptools-scm < 8.0.0 pip >= 23.3,< 24.0 ; python_version < '3.12' pip >24 ; python_version >= '3.12'