From nobody Thu Feb 23 18:48:43 2023 X-Original-To: dev-commits-ports-main@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 4PN29S1BTGz3sbvN; Thu, 23 Feb 2023 18:48:44 +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 4PN29R6gVsz3xQp; Thu, 23 Feb 2023 18:48:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677178123; 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=ISurVXn8CIGlUDGJ6kNWYL0E95cX5YhQ0Q6dHpbQDxo=; b=YkB1xR7RRjGq6pyoLh4xEtQs/niadcsgOdJvpTOoO1LCkX3c1/a7nG6luGiHKOnAHQODsg qxZ4mRGqxhR8YKhOGdA+d3SDiHXNny9DhuVmfmZxCQaVubSZH6DELIv9ARW6YXAv8+/UQJ YUindmlRv10FE3qymdeh3TJN/b+XIAO41tGtJCLN/N5cNRvx5QNfyFSh1zftcFFwMo68bA HBIGamHHSdOF5dq1bMRE41qW5JBbwDuZEGQkuqpx0j3Alv5ksKw2QymVZD9HXXTEJ5MFMV ssiNOVBLQm/6/uPScPWWRecbI5mbI8uricVCovhSFBPEcEUCObU8/zezdfXEvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677178123; 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=ISurVXn8CIGlUDGJ6kNWYL0E95cX5YhQ0Q6dHpbQDxo=; b=xeJsTTaPuS+XYCjWXvHcSm3fzXSBJ7gI1ZWxZHrLcVgXfOEZOZF7On++MuuAuUtCNTHkqZ zAs4aB2On9/oqQtIDwEwxe2i7h93xguaglN63YD7bJTYhX3rjxbCspC2cn3QqcQlrw0YHS SPAdTNT0O6ck+IIQSwrJYev/RcQBUaybKtSGss97aFlrimEY8KrW8HTUTcLniAFEMtwC7f xSnn36hTkAfNuLAIAjBa2dw77iDKx6sBwSmk4vx3PeRw6WLP2o6H/QRbxJqIJn3dBW9Pz5 j5lfrN3B5tgRLUDUrQ7WevVrUmL7IdGBRiWlXFKdSPWovjadHUm4WcBMqDYyDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677178123; a=rsa-sha256; cv=none; b=HFZqGLVM92yCzqmWWpUIyQ3qt9a91llqF3riMLA1DImBU56XZ9QsWbfHPeJb6brC1Dilvp 746fMJTVK92a5wvKLh0oyOgA+oAuzpC9tJfwhEi6o5IBE+Dxj6RXQKSBx6n4l+qO0V1rDq nd4//AMx4GfZyD94SccjZifNqsISKq1MTqr/skYGezlJcWjPKfZOknngLmsiUdn4T17ix/ QcupmL2GlDADRwfTgqkinrWaH7Hy9QpXpTowkjqd36Skiv6FOMppFMHpnUX/gX32I7to0H rwMe2tn3j7YPUPAEqta2PN23xgKj/RjEMl8oInpkJ1iz6Kr+XdSRr0KoJItWHg== 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 4PN29R5m9tzt6V; Thu, 23 Feb 2023 18:48:43 +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 31NImhkt048744; Thu, 23 Feb 2023 18:48:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NImhfY048743; Thu, 23 Feb 2023 18:48:43 GMT (envelope-from git) Date: Thu, 23 Feb 2023 18:48:43 GMT Message-Id: <202302231848.31NImhfY048743@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: f73094c9a4f1 - main - textproc/py-ntc-templates: Update to 3.2.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f73094c9a4f145b8718b86701a9025e357fd1242 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=f73094c9a4f145b8718b86701a9025e357fd1242 commit f73094c9a4f145b8718b86701a9025e357fd1242 Author: Kai Knoblich AuthorDate: 2023-02-23 18:45:34 +0000 Commit: Kai Knoblich CommitDate: 2023-02-23 18:48:32 +0000 textproc/py-ntc-templates: Update to 3.2.0 * Switch to the PEP-517 build framework and remove the setuptools workaround. * Also convert "do-test" target to USE_PYTHON=pytest while I'm here. Changelog: https://github.com/networktocode/ntc-templates/compare/v3.1.0...v3.2.0 MFH: No (PEP-517 support not present in the 2023Q1 branch) --- textproc/py-ntc-templates/Makefile | 17 ++++--------- textproc/py-ntc-templates/distinfo | 6 ++--- .../py-ntc-templates/files/patch-pyproject.toml | 14 +++++++++++ textproc/py-ntc-templates/files/patch-setup.py | 29 ---------------------- 4 files changed, 22 insertions(+), 44 deletions(-) diff --git a/textproc/py-ntc-templates/Makefile b/textproc/py-ntc-templates/Makefile index 0bb975dd8520..4876c15772c5 100644 --- a/textproc/py-ntc-templates/Makefile +++ b/textproc/py-ntc-templates/Makefile @@ -1,6 +1,6 @@ PORTNAME= ntc-templates DISTVERSIONPREFIX= v -DISTVERSION= 3.1.0 +DISTVERSION= 3.2.0 CATEGORIES= textproc net-mgmt python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,25 +11,18 @@ WWW= https://github.com/networktocode/ntc-templates LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.0.0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}textfsm>=1.1.0<2.0.0:textproc/py-textfsm@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -USES= python:3.6+ +USES= python:3.7+ USE_GITHUB= yes GH_ACCOUNT= networktocode -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist pep517 pytest TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} NO_ARCH= yes -post-patch: - @${REINPLACE_CMD} -e 's|%%DISTVERSION%%|${DISTVERSION}|' \ - ${WRKSRC}/setup.py - -do-test: - @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs - .include diff --git a/textproc/py-ntc-templates/distinfo b/textproc/py-ntc-templates/distinfo index 13455d188288..f697d762cf0b 100644 --- a/textproc/py-ntc-templates/distinfo +++ b/textproc/py-ntc-templates/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662218002 -SHA256 (networktocode-ntc-templates-v3.1.0_GH0.tar.gz) = e6aafd7dda5a74ccd85ce49868d9a9902e6553fd4944d01b24ecaf76d81a453e -SIZE (networktocode-ntc-templates-v3.1.0_GH0.tar.gz) = 802415 +TIMESTAMP = 1677151350 +SHA256 (networktocode-ntc-templates-v3.2.0_GH0.tar.gz) = ae13e834501c16a919f777b29adafd7d44be93c448ad1df90c34aad4b06a1657 +SIZE (networktocode-ntc-templates-v3.2.0_GH0.tar.gz) = 1003673 diff --git a/textproc/py-ntc-templates/files/patch-pyproject.toml b/textproc/py-ntc-templates/files/patch-pyproject.toml new file mode 100644 index 000000000000..7a58da8b4522 --- /dev/null +++ b/textproc/py-ntc-templates/files/patch-pyproject.toml @@ -0,0 +1,14 @@ +Avoid installing "LICENSE" and "README.md" on top of Python's "site-packages/" +directory which would lead to conflicting packages. + +--- pyproject.toml.orig 2023-02-23 18:07:16 UTC ++++ pyproject.toml +@@ -19,8 +19,6 @@ include = [ + "Programming Language :: Python :: 3.10", + ] + include = [ +- "LICENSE", +- "README.md", + "ntc_templates/templates/*.textfsm", + "ntc_templates/templates/index", + ] diff --git a/textproc/py-ntc-templates/files/patch-setup.py b/textproc/py-ntc-templates/files/patch-setup.py deleted file mode 100644 index 279ced16c65b..000000000000 --- a/textproc/py-ntc-templates/files/patch-setup.py +++ /dev/null @@ -1,29 +0,0 @@ ---- setup.py.orig 2022-03-27 21:10:43 UTC -+++ setup.py -@@ -0,0 +1,26 @@ -+# -*- coding: utf-8 -*- -+from setuptools import setup -+ -+packages = \ -+['ntc_templates'] -+ -+package_data = \ -+{'': ['*'], 'ntc_templates': ['templates/*']} -+ -+install_requires = \ -+['textfsm>=1.1.0,<2.0.0'] -+ -+setup_kwargs = { -+ 'name': 'ntc-templates', -+ 'version': '%%DISTVERSION%%', -+ 'description': "TextFSM Templates for Network Devices, and Python wrapper for TextFSM's CliTable.", -+ 'author': 'Network to Code', -+ 'author_email': 'info@networktocode.com', -+ 'url': 'https://github.com/networktocode/ntc-templates', -+ 'packages': packages, -+ 'package_data': package_data, -+ 'install_requires': install_requires, -+ 'python_requires': '>=3.6,<4.0', -+} -+ -+setup(**setup_kwargs)