From nobody Thu May 11 07:21:53 2023 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 4QH3HP2XRlz49r86; Thu, 11 May 2023 07:21:53 +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 4QH3HP25bhz3JcS; Thu, 11 May 2023 07:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683789713; 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=BCpcwM8T4h3VGm2VI27SZ749YUAspCjogIHs/EvHLPo=; b=pvVXM8wBTDlI821cQYoqi90lWSr4OlPVuXHtredOf9IKbZU081vx4lEVzHJeyNAGUthAA4 wxgXNWtql9A6SntdoQtufOHm+yN/xRfv85+gngqcMgeq3/gMhKzXtd1kijJ8aVCs76wTm0 SP1y9xs/61u1C9HloUUov6Fal62sCICEo0X5/qLpsimFgkVD8LnT6Pe9BK8v0vzUQakD6Q JhjQuJB3e8kla1/3cTMnnRVHCXhk1TjknKOabJvlqbVzIL0eXemGsK/JlKjSdo+ayxunmG 6owzkeShvPZvJ2LhNnE7TAqZaI9/mvEXN3G9N7DON5KI2XGlAAAKxJaGSgJ67w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683789713; 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=BCpcwM8T4h3VGm2VI27SZ749YUAspCjogIHs/EvHLPo=; b=Re1gVcnC13v2jceoZ7I2n8I6V6jaWIhqhh5IRxEt3XwrB7U88GquWimeiYDyT0l1lAJMu1 0XLdNcBJaRTfN/Y8PR/B4CPpFuAt84KfPDR+Jk2mj1biWhVBmzei41UyXvnCgj4tT8cE8G saDXUKTd8EScHKASzVzqGBXrYedkB/YT5izQbHMnM3GbZEwrqcwERufztN84nttzv40ZR1 N01uearr6GBmuu0IuHF/hssxoP6jSHZ7VwX4LQZX5ZTW3UJO+2VfvlPQYR8FCDxzOs4i2l Yd7X2ldgUJzR+RR64lEtcHdJPTuvJ7ZTuSR9SoMLQQtyAgQknrM9z3fC0M2LiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683789713; a=rsa-sha256; cv=none; b=fT4FeBa4xs+szEYRI0IoeVCOspaBX/U/UTj45/aXwfPN8cE/oDQG+lpRT4SEsMY7U3DPjL wxpWPLjHn6LL4+Xmuzl6lc5ab5gWKwFd0CyTz+cHXW6aF/TxaxAf7WbHaW8ti3XYYt+mMy F6NHxaGIiUet24aCy0vM6o6MysZ+Z+RvVpvjwh9dq22dJ2OlVKXcgwe4fdwlmWnBm4HPm1 WMDMLmt49ECIH/P/cn1C0xjdiTrKA0Gx2gVofHVx2wJhSVzoiTLVJCTsVm9C4CuKoWGsF8 E7kDeEH6h4s3zG+8g+SzegktSnp8MYPOQijPca7p6X8paBCHnRftsdW3O8fkrw== 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 4QH3HP18bRzk34; Thu, 11 May 2023 07:21:53 +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 34B7LrXX062376; Thu, 11 May 2023 07:21:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B7Lrs6062375; Thu, 11 May 2023 07:21:53 GMT (envelope-from git) Date: Thu, 11 May 2023 07:21:53 GMT Message-Id: <202305110721.34B7Lrs6062375@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: f37a5323291b - main - sysutils/py-ansible-lint: fix the `make test` target 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: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f37a5323291b14ad970cac08c9cf5a0a216c40c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=f37a5323291b14ad970cac08c9cf5a0a216c40c7 commit f37a5323291b14ad970cac08c9cf5a0a216c40c7 Author: Matthew Seaman AuthorDate: 2023-05-11 07:16:12 +0000 Commit: Matthew Seaman CommitDate: 2023-05-11 07:21:48 +0000 sysutils/py-ansible-lint: fix the `make test` target Enable the test suite to actually run. Currently this results in: 12 failed, 782 passed in 915.04s (0:15:15) --- sysutils/py-ansible-lint/Makefile | 29 +++++++++++----------- sysutils/py-ansible-lint/files/patch-conftest.py | 11 ++++++++ .../files/patch-tools_install-reqs.sh | 8 ++++++ 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/sysutils/py-ansible-lint/Makefile b/sysutils/py-ansible-lint/Makefile index 14114787f245..90fe12fd0149 100644 --- a/sysutils/py-ansible-lint/Makefile +++ b/sysutils/py-ansible-lint/Makefile @@ -1,5 +1,6 @@ PORTNAME= ansible-lint PORTVERSION= 6.16.0 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,29 +23,29 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ansible-core>=2.12.0:sysutils/py-ansible-cor ${PYTHON_PKGNAMEPREFIX}wcmatch>=8.1.2:textproc/py-wcmatch@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yamllint>=1.30.0:devel/py-yamllint@${PY_FLAVOR} - BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=63.0.0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools_scm7>=7.0.5:devel/py-setuptools_scm7@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} - -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage_enable_subprocess>0:devel/py-coverage_enable_subprocess@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}coverage>-6.4.4:devel/py-coverage@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ - pylint${PYTHON_PKGNAMESUFFIX}>0:devel/pylint@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>7.2.2:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage_enable_subprocess>=0:devel/py-coverage_enable_subprocess@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>=6.4.4:devel/py-coverage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>=0:devel/py-jmespath@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}mypy>=0:devel/py-mypy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}netaddr>=0:net/py-netaddr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>=0:sysutils/py-psutil@${PY_FLAVOR} \ + pylint${PYTHON_PKGNAMESUFFIX}>=0:devel/pylint@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=7.2.2:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-plus>=0.2:devel/py-pytest-plus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.1.0:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ruamel.yaml.clib>0:devel/py-ruamel.yaml.clib${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}spdx-tools>0.7.1:misc/py-spdx-tools@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}types-jsonschema>0:devel/py-types-jsonschema@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}types-PyYAML>0:devel/py-types-PyYAML@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ruamel.yaml.clib>=0:devel/py-ruamel.yaml.clib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}spdx-tools>=0.7.1:misc/py-spdx-tools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}types-jsonschema>=0:devel/py-types-jsonschema@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}types-PyYAML>=0:devel/py-types-PyYAML@${PY_FLAVOR} USES= python:3.9+ USE_PYTHON= autoplist concurrent pep517 pytest +TEST_ENV= LC_ALL=C.UTF-8 PYTHONPATH=${WRKSRC}/src NO_ARCH= yes .include diff --git a/sysutils/py-ansible-lint/files/patch-conftest.py b/sysutils/py-ansible-lint/files/patch-conftest.py new file mode 100644 index 000000000000..2a26b6a13fab --- /dev/null +++ b/sysutils/py-ansible-lint/files/patch-conftest.py @@ -0,0 +1,11 @@ +--- conftest.py.orig 2023-05-09 16:16:59 UTC ++++ conftest.py +@@ -44,7 +44,7 @@ if not HAS_LIBYAML: + # While presence of libyaml is not required for runtime, we keep this error + # fatal here in order to be sure that we spot libyaml errors during testing. + arch = platform.machine() +- if arch not in ("arm64", "x86_64"): ++ if arch not in ("arm64", "amd64"): + warnings.warn( + f"This architecture ({arch}) is not supported by libyaml, performance will be degraded.", + category=pytest.PytestWarning, diff --git a/sysutils/py-ansible-lint/files/patch-tools_install-reqs.sh b/sysutils/py-ansible-lint/files/patch-tools_install-reqs.sh new file mode 100644 index 000000000000..defdd608c79a --- /dev/null +++ b/sysutils/py-ansible-lint/files/patch-tools_install-reqs.sh @@ -0,0 +1,8 @@ +--- tools/install-reqs.sh.orig 2023-05-10 11:30:52 UTC ++++ tools/install-reqs.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/usr/bin/env bash + set -euo pipefail + pushd examples/playbooks/collections >/dev/null + MISSING=()