diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile index d334c5a230f1..0887d9b13c8a 100644 --- a/sysutils/py-ansible-core/Makefile +++ b/sysutils/py-ansible-core/Makefile @@ -1,88 +1,87 @@ PORTNAME= ansible-core -DISTVERSION= 2.18.5 -PORTREVISION= 1 +DISTVERSION= 2.18.6 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= ${PORTNAME:R:S/-/_/}-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= cy@FreeBSD.org COMMENT= Radically simple IT automation WWW= https://www.ansible.com/ WRKSRC= ${WRKDIR}/${PORTNAME:R:S/-/_/}-${DISTVERSION} LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}resolvelib>=0.5.3<1.1.0:devel/py-resolvelib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ git:devel/git USES= ansible:env cpe python:3.10+ shebangfix CPE_VENDOR= redhat CPE_PRODUCT= ansible USE_PYTHON= autoplist concurrent cryptography pep517 SHEBANG_REGEX= [.]/test/.*[.]py # Pass MAKE_ENV to TEST_ENV so that binary aliases via an updated PATH. TEST_ENV= ${MAKE_ENV} # The "python" binary alias is needed for the tests. BINARY_ALIAS= python=${PYTHON_CMD} NO_ARCH= yes post-patch: # Preserve the original paths in # test/units/cli/galaxy/test_execute_list_collection.py. # Replacing /usr/share/ansible breaks tests. ${FIND} ${WRKSRC} -not -regex '${WRKSRC}/test/units/cli/galaxy/test_execute_list_collection.py' -type f -print0 | \ ${XARGS} -0 ${REINPLACE_CMD} \ -e 's|/etc/ansible|${ETCDIR}|g' \ -e 's|/usr/share/ansible|${DATADIR}|g' ${FIND} ${WRKSRC} -type f -name "*.bak" -delete post-stage: ${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \ -execdir ${RLN} ansible-${PYTHON_VER} {} \; # USE_PYTHON=autoplist doesn't add this file to pkg-plist. ${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory pre-test: # This one file does not get its paths replaced correctly in post-patch. ${REINPLACE_CMD} 's|"/etc"|"${ETCDIR:H}"|g' \ ${WRKSRC}/test/units/playbook/test_helpers.py # This test constructs a Python script inline and uses an invalid path to it. ${REINPLACE_CMD} 's|/usr/bin/python|${PYTHON_CMD}|' \ ${WRKSRC}/test/units/modules/test_async_wrapper.py # Skip the SELinux tests, it's not present on FreeBSD. ${RM} ${WRKSRC}/test/units/module_utils/basic/test_selinux.py # Disable some failing tests. They fail to detect that emoji are of width 2 istead of 1. ${RM} ${WRKSRC}/test/units/utils/test_display.py do-test: @cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ./bin/ansible-test units -v --python ${PYTHON_VER} .include # Make sure that we override the unique DATADIR and ETCDIR set # by the implicit USES=uniquefiles. DATADIR= ${ANSIBLE_DATADIR} ETCDIR= ${ANSIBLE_ETCDIR} diff --git a/sysutils/py-ansible-core/distinfo b/sysutils/py-ansible-core/distinfo index 3c1f067ad53e..963c3c0eb6c1 100644 --- a/sysutils/py-ansible-core/distinfo +++ b/sysutils/py-ansible-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745294574 -SHA256 (ansible_core-2.18.5.tar.gz) = 319304d161770a8a891c07dec8a22c528548a948a7097eaf1a79939395105535 -SIZE (ansible_core-2.18.5.tar.gz) = 3083407 +TIMESTAMP = 1749221939 +SHA256 (ansible_core-2.18.6.tar.gz) = 25bb20ce1516a1b7307831b263cef684043b3720711466bd9d4164e5fd576557 +SIZE (ansible_core-2.18.6.tar.gz) = 3088072 diff --git a/sysutils/py-ansible-core/files/patch-pyproject.toml b/sysutils/py-ansible-core/files/patch-pyproject.toml index 50594db0bc9d..6d6635b3ccb6 100644 --- a/sysutils/py-ansible-core/files/patch-pyproject.toml +++ b/sysutils/py-ansible-core/files/patch-pyproject.toml @@ -1,9 +1,9 @@ ---- pyproject.toml.orig 2025-04-21 14:51:57.000000000 -0700 -+++ pyproject.toml 2025-04-21 21:08:26.075285000 -0700 +--- pyproject.toml.orig 2025-05-19 16:56:48 UTC ++++ pyproject.toml @@ -1,5 +1,5 @@ [build-system] --requires = ["setuptools >= 66.1.0, <= 76.0.0", "wheel == 0.45.1"] # lower bound to support controller Python versions, upper bound for latest version tested at release -+requires = ["setuptools >= 63.1.0, <= 76.0.0", "wheel == 0.45.1"] # lower bound to support controller Python versions, upper bound for latest version tested at release +-requires = ["setuptools >= 66.1.0, <= 80.7.1", "wheel == 0.45.1"] # lower bound to support controller Python versions, upper bound for latest version tested at release ++requires = ["setuptools >= 63.1.0, <= 80.7.1", "wheel == 0.45.1"] # lower bound to support controller Python versions, upper bound for latest version tested at release build-backend = "setuptools.build_meta" [project]