diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile index 30816dc4d036..2c401f0dd915 100644 --- a/sysutils/py-ansible-core/Makefile +++ b/sysutils/py-ansible-core/Makefile @@ -1,107 +1,106 @@ PORTNAME= ansible-core -DISTVERSION= 2.14.3 +DISTVERSION= 2.15.0 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= 0mp@FreeBSD.org COMMENT= Radically simple IT automation WWW= https://www.ansible.com/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>3.0.0:devel/py-Jinja2@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=45.2.0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ + ${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<0.9:devel/py-resolvelib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>5.1:devel/py-yaml@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}resolvelib>=0.5.3<1.1.0:devel/py-resolvelib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${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}pycrypto>=0:security/py-pycrypto@${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 gmake python:3.8+ shebangfix +USES= ansible:env cpe python:3.9+ shebangfix CPE_VENDOR= redhat CPE_PRODUCT= ansible -USE_PYTHON= autoplist concurrent distutils +USE_PYTHON= autoplist concurrent pep517 SHEBANG_REGEX= [.]/test/.*[.]py -TEST_ARGS= VERSION=${DISTVERSION} \ - PYTHON=${PYTHON_CMD} \ - DATE= # Pass MAKE_ENV to TEST_ENV so that binary aliases via an updated PATH. -TEST_ENV= ${MAKE_ENV} PYTHON_VERSION=${PYTHON_VER} -TEST_TARGET= tests - -CONFLICTS= py*-ansible-base py*-ansible2 py-ansible-core211 +TEST_ENV= ${MAKE_ENV} # The "python" binary alias is needed for the tests. BINARY_ALIAS= python=${PYTHON_CMD} NO_ARCH= yes PLIST_FILES= share/man/man1/ansible-config.1.gz \ share/man/man1/ansible-console.1.gz \ share/man/man1/ansible-doc.1.gz \ share/man/man1/ansible-galaxy.1.gz \ share/man/man1/ansible-inventory.1.gz \ share/man/man1/ansible-playbook.1.gz \ share/man/man1/ansible-pull.1.gz \ share/man/man1/ansible-vault.1.gz \ share/man/man1/ansible.1.gz PORTEXAMPLES= ansible.cfg hosts OPTIONS_DEFINE= DOCS EXAMPLES 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-install: @${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/*.1 \ ${STAGEDIR}${MAN1PREFIX}/share/man/man1 post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR} 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 6040e7e18745..ba4fb6d6087e 100644 --- a/sysutils/py-ansible-core/distinfo +++ b/sysutils/py-ansible-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678486345 -SHA256 (ansible-core-2.14.3.tar.gz) = 093a4bc4a1259eaeb56ea37ec1d33cf1836c88f39281d89197f8d3480e068a58 -SIZE (ansible-core-2.14.3.tar.gz) = 11516886 +TIMESTAMP = 1685093572 +SHA256 (ansible-core-2.15.0.tar.gz) = cf690fd4ebb40590e00c5acdc0624758ca4c58d1e4b2b02ec026a034070ebf4d +SIZE (ansible-core-2.15.0.tar.gz) = 10801327