View | Details | Raw Unified | Return to bug 267845
Collapse All | Expand All

(-)sysutils/py-salt/Makefile (-1 / +2 lines)
Lines 1-5 Link Here
1
PORTNAME=	salt
1
PORTNAME=	salt
2
PORTVERSION=	3005
2
PORTVERSION=	3005.1
3
CATEGORIES=	sysutils python
3
CATEGORIES=	sysutils python
4
MASTER_SITES=	CHEESESHOP
4
MASTER_SITES=	CHEESESHOP
5
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
5
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 20-25 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ Link Here
20
		${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \
20
		${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
21
		${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \
22
		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
22
		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \
23
		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR}
24
		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR}
24
25
25
USES=		cpe python:3.6-3.9
26
USES=		cpe python:3.6-3.9
(-)sysutils/py-salt/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1661580885
1
TIMESTAMP = 1668768917
2
SHA256 (salt-3005.tar.gz) = 1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4
2
SHA256 (salt-3005.1.tar.gz) = fa14c5d873f863b50950121d7e23a2449502745490c7c48c0cf045406cfe57c1
3
SIZE (salt-3005.tar.gz) = 17894520
3
SIZE (salt-3005.1.tar.gz) = 17914349
(-)sysutils/py-salt/files/patch-disable-distutils-warn.patch (+47 lines)
Added Link Here
1
From 1b7fac1599a50c970fdef49abca7151cb11bdcd0 Mon Sep 17 00:00:00 2001
2
From: Pedro Algarvio <palgarvio@vmware.com>
3
Date: Tue, 11 Oct 2022 21:19:21 +0100
4
Subject: [PATCH] Disable the setuptools user warning "Setuptools is replacing
5
 distutils."
6
7
Once we stop relying on distutils, this filter can be removed.
8
9
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
10
---
11
 salt/__init__.py | 8 ++++++++
12
 setup.py         | 2 ++
13
 2 files changed, 10 insertions(+)
14
15
diff --git a/salt/__init__.py b/salt/__init__.py
16
index ebc54ac8443c..ec551abbc62a 100644
17
--- salt/__init__.py
18
+++ salt/__init__.py
19
@@ -69,6 +69,14 @@ def load_module(self, name):
20
     append=True,
21
 )
22
 
23
+# Filter the setuptools UserWarning until we stop relying on distutils
24
+warnings.filterwarnings(
25
+    "ignore",
26
+    message="Setuptools is replacing distutils.",
27
+    category=UserWarning,
28
+    module="_distutils_hack",
29
+)
30
+
31
 
32
 def __define_global_system_encoding_variable__():
33
     import sys
34
diff --git a/setup.py b/setup.py
35
index 0fac50ab4bc6..9d994ac8730c 100755
36
--- setup.py
37
+++ setup.py
38
@@ -4,6 +4,8 @@
39
 """
40
 
41
 # pylint: disable=file-perms,resource-leakage
42
+import setuptools  # isort:skip
43
+
44
 import contextlib
45
 import distutils.dist
46
 import glob
47

Return to bug 267845