From nobody Fri Nov 18 14:23:57 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NDJtj5Y1rz4hWKP; Fri, 18 Nov 2022 14:23:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NDJtj50lfz3q6q; Fri, 18 Nov 2022 14:23:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668781437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ozcjXizGHFQgKfRR/3G8XXqTiVEfTNd3Sza7pQRFVoU=; b=kVzilXJcNGH6OF3ZnkioUV/reLL9xDrQmnWy9eRcwx52s1XnRAgnHTJKvSkQJlBVuxj3HX YNcf5mbTHj+bt8v5Wf2PUNwh4yY8PGt1W45gAmLmINgIQVTZr33+Nwqv51/h5231hzcb73 7hhJHmt37YEsZIOF9y8fsWHjCTPbLcDBYD6TotfZNhzex4pZDZF0097U58BUm3YauPMXTW JrMcwIkuydgaQLzz1Etfwf432C7Fkc1iWZp8fuelHBr/s7HYRxeJuwwiQWAbuJUCfgTULu FcPhn7BYcJnMav3ILz15VXUCA4Uuq0QvmbsYApMEQPVlRuFmO6sDqhK6XZXBxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668781437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ozcjXizGHFQgKfRR/3G8XXqTiVEfTNd3Sza7pQRFVoU=; b=GGXud8mvZBZ5G9BDl6v+BEC9TBDvPGHeMyQvL2+8sio08cr+DVBXAI3CQM7Ydo7ue8dRVG SKSNBbygQFKybCE4zmdAWIBc9mJsrI8fCH3qeAX4yaXkkHLwtVKqma+kLETY+xvCA0RDzf +DtVnPRD4Q4A674PZKeYtYjqQSItpl4whmkn0iTS2OB+W6nkXVgqEPHjpKaQZQrAaDuaNO Xa75GtzfxtorYiOmRiQinu4NjDM7cyYZ3KCLlQYTpJchpXBFzctKnFONkypN9Mp5TqE6om CNrV38Awug8jnPovMZZWnp+97yFd+17dobHiyeQ3KftkPebdt7v6Gm7PucsUoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668781437; a=rsa-sha256; cv=none; b=ijs3/TiHeW3ZiLhXuBS+wT/IK6F3oH06qgJ+MQsTWBN2FmKA7AY86VpRraZIlsave8gM1V eyV2vsMNGlGZlkCoOuFjYGe0C2Qn+3cJkV3vaSgAMRNWXLQm/WExsOZSi/9cBJtW2cpT4N Tpg5P5tjhRgXXckjWssuJIvtuRpJdifHLkJWW3r8Grz4mV1wM8xNWkaBtIPlsHavHCxDby liYPRehdt0BXAk3qtMu1nHLwzfDLWrz3UygEiwyNxdc2/CDKHQgYvW5AxRabeyKbGfwKQM MNroOCpZdGgOvMeOuDTvMTn47Ad4owB0PZ+mSM4o3/If3a2g3t7MuASYGUnslw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NDJtj43Rwz1NwS; Fri, 18 Nov 2022 14:23:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AIENvte087913; Fri, 18 Nov 2022 14:23:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIENvdv087912; Fri, 18 Nov 2022 14:23:57 GMT (envelope-from git) Date: Fri, 18 Nov 2022 14:23:57 GMT Message-Id: <202211181423.2AIENvdv087912@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: 9b3b2cf3202f - main - sysutils/py-salt: Update to 3005.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b3b2cf3202f6a663e9a2cd2b271a39be47f1572 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=9b3b2cf3202f6a663e9a2cd2b271a39be47f1572 commit 9b3b2cf3202f6a663e9a2cd2b271a39be47f1572 Author: Kirill Ponomarev AuthorDate: 2022-11-18 14:22:35 +0000 Commit: Kirill Ponomarev CommitDate: 2022-11-18 14:22:35 +0000 sysutils/py-salt: Update to 3005.1 PR: 267845 Reported by: i.dani at outlookdottcom --- sysutils/py-salt/Makefile | 3 +- sysutils/py-salt/distinfo | 6 +-- .../files/patch-disable-distutils-warn.patch | 47 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 3eeb0a5ca530..8bf9c989db66 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,5 +1,5 @@ PORTNAME= salt -PORTVERSION= 3005 +PORTVERSION= 3005.1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,6 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} USES= cpe python:3.6-3.9 diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index a00437778fc5..e9a19972f76b 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661580885 -SHA256 (salt-3005.tar.gz) = 1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4 -SIZE (salt-3005.tar.gz) = 17894520 +TIMESTAMP = 1668768917 +SHA256 (salt-3005.1.tar.gz) = fa14c5d873f863b50950121d7e23a2449502745490c7c48c0cf045406cfe57c1 +SIZE (salt-3005.1.tar.gz) = 17914349 diff --git a/sysutils/py-salt/files/patch-disable-distutils-warn.patch b/sysutils/py-salt/files/patch-disable-distutils-warn.patch new file mode 100644 index 000000000000..72e8fb774d9a --- /dev/null +++ b/sysutils/py-salt/files/patch-disable-distutils-warn.patch @@ -0,0 +1,47 @@ +From 1b7fac1599a50c970fdef49abca7151cb11bdcd0 Mon Sep 17 00:00:00 2001 +From: Pedro Algarvio +Date: Tue, 11 Oct 2022 21:19:21 +0100 +Subject: [PATCH] Disable the setuptools user warning "Setuptools is replacing + distutils." + +Once we stop relying on distutils, this filter can be removed. + +Signed-off-by: Pedro Algarvio +--- + salt/__init__.py | 8 ++++++++ + setup.py | 2 ++ + 2 files changed, 10 insertions(+) + +diff --git a/salt/__init__.py b/salt/__init__.py +index ebc54ac8443c..ec551abbc62a 100644 +--- salt/__init__.py ++++ salt/__init__.py +@@ -69,6 +69,14 @@ def load_module(self, name): + append=True, + ) + ++# Filter the setuptools UserWarning until we stop relying on distutils ++warnings.filterwarnings( ++ "ignore", ++ message="Setuptools is replacing distutils.", ++ category=UserWarning, ++ module="_distutils_hack", ++) ++ + + def __define_global_system_encoding_variable__(): + import sys +diff --git a/setup.py b/setup.py +index 0fac50ab4bc6..9d994ac8730c 100755 +--- setup.py ++++ setup.py +@@ -4,6 +4,8 @@ + """ + + # pylint: disable=file-perms,resource-leakage ++import setuptools # isort:skip ++ + import contextlib + import distutils.dist + import glob +