87 lines
2.2 KiB
Diff
87 lines
2.2 KiB
Diff
diff -up salt-3007.8/requirements/base.txt_fix salt-3007.8/requirements/base.txt
|
|
--- salt-3007.8/requirements/base.txt_fix 2025-10-26 22:45:13.452981109 -0500
|
|
+++ salt-3007.8/requirements/base.txt 2025-10-26 22:47:41.791836003 -0500
|
|
@@ -5,60 +5,41 @@ jmespath
|
|
msgpack>=1.0.0
|
|
PyYAML
|
|
MarkupSafe
|
|
-requests<2.32.0 ; python_version < '3.10'
|
|
-requests>=2.32.3 ; python_version >= '3.10'
|
|
-certifi==2023.07.22; python_version < '3.10'
|
|
-certifi>=2024.7.4; python_version >= '3.10'
|
|
+requests
|
|
+certifi
|
|
distro>=1.0.1
|
|
-psutil<6.0.0; python_version <= '3.9'
|
|
-psutil>=5.0.0; python_version >= '3.10'
|
|
+psutil
|
|
# Packaging 24.1 imports annotations from __future__ which breaks salt ssh
|
|
# tests on target hosts with older python versions.
|
|
-packaging==24.0
|
|
+packaging
|
|
looseversion
|
|
-tornado>=6.4.1
|
|
-aiohttp>=3.10.2
|
|
+tornado
|
|
+aiohttp
|
|
|
|
-croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'
|
|
+croniter
|
|
|
|
-setproctitle>=1.2.3
|
|
-timelib>=0.2.5
|
|
-pyopenssl>=24.0.0
|
|
-python-dateutil>=2.8.1
|
|
-python-gnupg>=0.4.7
|
|
-cherrypy>=18.6.1
|
|
-importlib-metadata>=3.3.0
|
|
-zipp>=3.19.1
|
|
-cryptography>=42.0.0
|
|
+setproctitle
|
|
+timelib
|
|
+pyopenssl
|
|
+python-dateutil
|
|
+python-gnupg
|
|
+cherrypy
|
|
+importlib-metadata
|
|
+zipp
|
|
+cryptography
|
|
|
|
# From old requirements/static/pkg/linux.in
|
|
rpm-vercmp; sys_platform == 'linux'
|
|
|
|
# From old windows.txt requirements file
|
|
-gitpython>=3.1.37; sys_platform == 'win32'
|
|
-lxml>=4.6.3; sys_platform == 'win32'
|
|
-pymssql>=2.2.11; sys_platform == 'win32'
|
|
-pymysql>=1.0.2; sys_platform == 'win32'
|
|
-pythonnet>=3.0.1; sys_platform == 'win32'
|
|
-pywin32>=305; sys_platform == 'win32'
|
|
-wmi>=1.5.1; sys_platform == 'win32'
|
|
-xmltodict>=0.13.0; sys_platform == 'win32'
|
|
-croniter>=0.3.0,!=0.3.22; sys_platform != 'win32'
|
|
|
|
# We need contextvars for salt-ssh
|
|
-contextvars
|
|
|
|
# immutables is a requirement of contextvars
|
|
-immutables==0.15 ; sys_platform == 'linux'
|
|
-immutables>=0.21 ; sys_platform != 'linux'
|
|
-cryptography>=42.0.0
|
|
-
|
|
-urllib3>=1.26.20,<2.0.0; python_version < '3.10'
|
|
-urllib3>=2.5.0; python_version >= '3.10'
|
|
-
|
|
-jaraco.text>=4.0.0
|
|
-jaraco.functools>=4.1.0
|
|
-timelib>=0.2.5; python_version < '3.11'
|
|
-timelib>=0.3.0; python_version >= '3.11'
|
|
-frozenlist>=1.3.0; python_version < '3.11'
|
|
-frozenlist>=1.5.0; python_version >= '3.11'
|
|
+
|
|
+urllib3
|
|
+
|
|
+jaraco.text
|
|
+jaraco.functools
|
|
+timelib
|
|
+frozenlist
|