From owner-dev-commits-ports-all@freebsd.org Wed May 5 12:02:51 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0F51363C77B; Wed, 5 May 2021 12:02:51 +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 4FZwMG70wwz3nTF; Wed, 5 May 2021 12:02:50 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E1DCF24A9B; Wed, 5 May 2021 12:02:50 +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 145C2oDZ025613; Wed, 5 May 2021 12:02:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 145C2owO025612; Wed, 5 May 2021 12:02:50 GMT (envelope-from git) Date: Wed, 5 May 2021 12:02:50 GMT Message-Id: <202105051202.145C2owO025612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e617b04b232a - main - sysutils/ansible: Sort variables MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e617b04b232acaba804e94c1e998030c2b22f252 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2021 12:02:51 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=e617b04b232acaba804e94c1e998030c2b22f252 commit e617b04b232acaba804e94c1e998030c2b22f252 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-05-05 09:35:19 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-05-05 12:01:58 +0000 sysutils/ansible: Sort variables No functional changes intended. --- sysutils/ansible/Makefile | 75 +++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 41 deletions(-) diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 0fca725e9a61..fb2b48dd0a2d 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -11,64 +11,57 @@ COMMENT= Radically simple IT automation LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ +RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ +TEST_DEPENDS?= ${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}nose>0:devel/py-nose@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${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} USES?= cpe python:3.6+ shebangfix CPE_VENDOR= ansibleworks -USE_PYTHON= distutils autoplist concurrent +USE_PYTHON= autoplist concurrent distutils -SHEBANG_FILES?= \ +SHEBANG_FILES?= test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py \ test/lib/ansible_test/_data/injector/python.py \ - test/lib/ansible_test/_data/versions.py \ - test/lib/ansible_test/_data/virtualenvcheck.py \ - test/lib/ansible_test/_data/yamlcheck.py \ - test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py \ - test/lib/ansible_test/_data/sanity/import/importer.py \ - test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py \ + test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py \ + test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \ test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py \ - test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py \ + test/lib/ansible_test/_data/sanity/code-smell/line-endings.py \ + test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-assert.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py \ test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py \ test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py \ - test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py \ test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py \ - test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py \ test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py \ - test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py \ - test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py \ - test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py \ - test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py \ - test/lib/ansible_test/_data/sanity/code-smell/no-assert.py \ - test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py \ - test/lib/ansible_test/_data/sanity/code-smell/line-endings.py \ - test/lib/ansible_test/_data/sanity/code-smell/symlinks.py \ + test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py \ test/lib/ansible_test/_data/sanity/code-smell/shebang.py \ - test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \ - test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \ - test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \ + test/lib/ansible_test/_data/sanity/code-smell/symlinks.py \ + test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py \ + test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py \ test/lib/ansible_test/_data/sanity/compile/compile.py \ - test/lib/ansible_test/_data/sanity/validate-modules/main.py + test/lib/ansible_test/_data/sanity/import/importer.py \ + test/lib/ansible_test/_data/sanity/validate-modules/main.py \ + test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \ + test/lib/ansible_test/_data/versions.py \ + test/lib/ansible_test/_data/virtualenvcheck.py \ + test/lib/ansible_test/_data/yamlcheck.py -CONFLICTS?= ansible1-* \ - ansible23-* \ - ansible24-* \ - ansible25-* \ - ansible27-* \ - ansible26-* \ - ansible27-* \ - ansible28-* +CONFLICTS?= ansible1-* ansible23-* ansible24-* ansible25-* ansible26-* \ + ansible27-* ansible28-* EXTRA_PATCHES?= NO_ARCH= yes @@ -109,7 +102,7 @@ post-install-EXAMPLES-on: post-stage: ${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \ -execdir ${RLN} ansible-${PYTHON_VER} {} \; - # python autoplist doesn't add this file in plist +# python autoplist doesn't add this file in plist ${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory do-test: