Date: Tue, 13 Jun 2023 13:09:53 GMT From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 30a7be249c63 - main - sysutils/py-salt: Update to 3006.1 Message-ID: <202306131309.35DD9rw6092891@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=30a7be249c633edfd6bb5a3393b84b72eca5c41f commit 30a7be249c633edfd6bb5a3393b84b72eca5c41f Author: Kirill Ponomarev <krion@FreeBSD.org> AuthorDate: 2023-06-13 13:09:32 +0000 Commit: Kirill Ponomarev <krion@FreeBSD.org> CommitDate: 2023-06-13 13:09:32 +0000 sysutils/py-salt: Update to 3006.1 --- sysutils/py-salt/Makefile | 14 +++---- sysutils/py-salt/distinfo | 6 +-- .../files/patch-disable-distutils-warn.patch | 47 ---------------------- sysutils/py-salt/files/patch-requirements_base.txt | 7 ---- .../py-salt/files/patch-salt_utils_entrypoints.py | 27 ------------- sysutils/py-salt/files/patch-setup.py | 10 ++--- 6 files changed, 15 insertions(+), 96 deletions(-) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 25bd78b9f2e3..823ce3ae467a 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,6 +1,5 @@ PORTNAME= salt -PORTVERSION= 3005.1 -PORTREVISION= 2 +PORTVERSION= 3006.1 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,9 +21,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${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} + ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}looseversion>0:devel/py-looseversion@${PY_FLAVOR} -USES= cpe python:3.6-3.10 +USES= cpe python:3.7-3.10 CPE_VENDOR= saltstack CPE_PRODUCT= salt @@ -104,17 +104,17 @@ post-patch: do-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ - ${INSTALL_DATA} ${WRKSRC}/pkg/salt.bash \ + ${INSTALL_DATA} ${WRKSRC}/pkg/common/salt.bash \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/salt do-install-FISH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions/ - ${INSTALL_DATA} ${WRKSRC}/pkg/fish-completions/*.fish \ + ${INSTALL_DATA} ${WRKSRC}/pkg/common/fish-completions/*.fish \ ${STAGEDIR}${PREFIX}/share/fish/completions do-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${WRKSRC}/pkg/salt.zsh \ + ${INSTALL_DATA} ${WRKSRC}/pkg/common/salt.zsh \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_salt post-install: diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index e9a19972f76b..fa4df7acd744 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668768917 -SHA256 (salt-3005.1.tar.gz) = fa14c5d873f863b50950121d7e23a2449502745490c7c48c0cf045406cfe57c1 -SIZE (salt-3005.1.tar.gz) = 17914349 +TIMESTAMP = 1686660673 +SHA256 (salt-3006.1.tar.gz) = 95587bd611dea6affb6908d0ec2686cb7edb84c14144b4851776f127a60ec5b9 +SIZE (salt-3006.1.tar.gz) = 20400688 diff --git a/sysutils/py-salt/files/patch-disable-distutils-warn.patch b/sysutils/py-salt/files/patch-disable-distutils-warn.patch deleted file mode 100644 index 72e8fb774d9a..000000000000 --- a/sysutils/py-salt/files/patch-disable-distutils-warn.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1b7fac1599a50c970fdef49abca7151cb11bdcd0 Mon Sep 17 00:00:00 2001 -From: Pedro Algarvio <palgarvio@vmware.com> -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 <palgarvio@vmware.com> ---- - 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 - diff --git a/sysutils/py-salt/files/patch-requirements_base.txt b/sysutils/py-salt/files/patch-requirements_base.txt deleted file mode 100644 index ca1de7a491be..000000000000 --- a/sysutils/py-salt/files/patch-requirements_base.txt +++ /dev/null @@ -1,7 +0,0 @@ ---- requirements/base.txt.orig 2021-06-23 23:39:55.270387000 +0200 -+++ requirements/base.txt 2021-06-23 23:40:00.325729000 +0200 -@@ -4,4 +4,3 @@ - MarkupSafe - requests>=1.0.0 - distro>=1.0.1 --contextvars diff --git a/sysutils/py-salt/files/patch-salt_utils_entrypoints.py b/sysutils/py-salt/files/patch-salt_utils_entrypoints.py deleted file mode 100644 index 6dcfa3725648..000000000000 --- a/sysutils/py-salt/files/patch-salt_utils_entrypoints.py +++ /dev/null @@ -1,27 +0,0 @@ ---- salt/utils/entrypoints.py.orig 2022-09-26 21:22:01 UTC -+++ salt/utils/entrypoints.py -@@ -38,13 +38,20 @@ def iter_entry_points(group, name=None): - entry_points_listing = [] - entry_points = importlib_metadata.entry_points() - -- for entry_point_group, entry_points_list in entry_points.items(): -- if entry_point_group != group: -- continue -- for entry_point in entry_points_list: -+ try: -+ for entry_point in entry_points.select(group=group): - if name is not None and entry_point.name != name: - continue - entry_points_listing.append(entry_point) -+ except AttributeError: -+ # importlib-metadata<5.0.0 -+ for entry_point_group, entry_points_list in entry_points.items(): -+ if entry_point_group != group: -+ continue -+ for entry_point in entry_points_list: -+ if name is not None and entry_point.name != name: -+ continue -+ entry_points_listing.append(entry_point) - - return entry_points_listing - diff --git a/sysutils/py-salt/files/patch-setup.py b/sysutils/py-salt/files/patch-setup.py index 57f656f3b492..3c7447d42a75 100644 --- a/sysutils/py-salt/files/patch-setup.py +++ b/sysutils/py-salt/files/patch-setup.py @@ -1,13 +1,13 @@ ---- setup.py.orig 2020-06-18 07:24:31 UTC +--- setup.py.orig 2023-06-13 13:00:08 UTC +++ setup.py -@@ -1119,8 +1119,8 @@ class SaltDistribution(distutils.dist.Distribution): +@@ -951,8 +951,8 @@ class SaltDistribution(distutils.dist.Distribution): def _property_data_files(self): # Data files common to all scenarios data_files = [ -- ("share/man/man1", ["doc/man/salt-call.1", "doc/man/salt-run.1"]), +- ("share/man/man1", ["doc/man/salt-call.1"]), - ("share/man/man7", ["doc/man/salt.7"]), -+ ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']), -+ ('man/man7', ['doc/man/salt.7']) ++ ("man/man1", ["doc/man/salt-call.1"]), ++ ("man/man7", ["doc/man/salt.7"]), ] if self.ssh_packaging or PACKAGED_FOR_SALT_SSH: data_files[0][1].append("doc/man/salt-ssh.1")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306131309.35DD9rw6092891>