From nobody Sun Feb 05 18:15:02 2023 X-Original-To: dev-commits-ports-branches@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 4P8yGv14z9z3kgwB; Sun, 5 Feb 2023 18:15:03 +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 4P8yGv0dmgz4F4X; Sun, 5 Feb 2023 18:15:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675620903; 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=m+5rxwtPUGWqgxc+UWfozxNVib58prRf8T6uGQI8wbA=; b=o9brEUvDSFlI3sGZEbdd/zJ9x2e7yeYs7tI07/MFu0cyIUsLD/eTXycjEr2RDxWKGnmoo9 JWpolmeJ9QpRaidykzNEspFKfoukVcKgmWiKg/vF5wEEder6jdJFGKjAXfgCQHwIqwWw0v 1+C7ECVcSNAj9qYm+lDMydlLQVMK66kIR6t8sxv+wTeKXRn4b/lI6VY7zl0+0QRFNi1hNt Ydh2jcthb4r38F7ySy2JBVGaOxXgnNhzG8mzuARaVCj5xAhr4sRWeN8tTggJJK90CWAgm0 NnIEeFVFFCB3D7Lmg5z2/VbGHt8MBY/JFHwAv3cyz8QcdQ4zZY1pAE6A927iSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675620903; 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=m+5rxwtPUGWqgxc+UWfozxNVib58prRf8T6uGQI8wbA=; b=e9Z0BjmH9XiveTI44WFR8r475ZLolfzZ36t36tAhVaU2Mu93smMSpIrQzXkDiGFQmiHBSv W3WnwYId2hi/ssHxdUa7EIoUR7k/p1SBDN5qdx0iwAI8AzSPyUYcG0FJPOlZJmWZ4UtW6K UdVCJkNvFBmaGBm+7wApV9dVUUCs/tyoPLO2N4dJ+MNtSGdIPsAzj1XZGtzi9bkdZdvFP8 2XSGkCW3DHy8a0C62hbWZpK5hGdwgbDgk8ZSZmE2ePUVhtNoGYhuhoN8hT2sCW4viqkrFe LuNUtZE3njNChMW588plMJASh8W+F2Kpp+a50Mv2C6lwqjSpnVvtMJnYufY8vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675620903; a=rsa-sha256; cv=none; b=Zamr+dpwFgPES6VRaomcsfhriUGhXzEGXZtjLgyE/XXoslruwpjMxXDHbg14r7JuEW2KUm O8PHOqTOZPPSnM6SvRtdvzMIw0/oYmZlpdMpFM5/uafEX2pc3fZnWqKiX6uR53PahDCvAT 7aSQFvyOCr5Qst4vWNPnmS4H1z9e+wEDJy0IKkP31VoODm5YhHNmZMupVKpbKpDB55lDMF pWadgQTaMrsT3XJKOnvnIErQ22Tdk4O77AlNgttNDf6V9Qu5cD5MXNNpeIqZDUfktLZ1An SXz/27bK2HCV1JESvSvUoj/iRo6X7sXT6OHm+MKLn9waTz8H5GjfRk3Q3tV1EQ== 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 4P8yGt6rrbz14V6; Sun, 5 Feb 2023 18:15:02 +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 315IF2mc047943; Sun, 5 Feb 2023 18:15:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 315IF2S1047942; Sun, 5 Feb 2023 18:15:02 GMT (envelope-from git) Date: Sun, 5 Feb 2023 18:15:02 GMT Message-Id: <202302051815.315IF2S1047942@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 1b4c76fb30d8 - 2023Q1 - devel/py-pdm: Update to 2.2.1 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 1b4c76fb30d88421c7d460e6016d406eef61326f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b4c76fb30d88421c7d460e6016d406eef61326f commit 1b4c76fb30d88421c7d460e6016d406eef61326f Author: Po-Chuan Hsieh AuthorDate: 2023-02-05 15:18:38 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-02-05 18:14:47 +0000 devel/py-pdm: Update to 2.2.1 - Allow build with py-installer 0.6.0+ Changes: https://github.com/pdm-project/pdm/releases (cherry picked from commit fe8e1e003288c179cd5ac6ece3604da70578fa66) --- devel/py-pdm/Makefile | 33 +++++++++++++++++++++------------ devel/py-pdm/distinfo | 6 +++--- devel/py-pdm/files/setup.py | 42 +++++++++++++++++++++--------------------- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/devel/py-pdm/Makefile b/devel/py-pdm/Makefile index e9a4f995f722..a019392c6ab1 100644 --- a/devel/py-pdm/Makefile +++ b/devel/py-pdm/Makefile @@ -1,5 +1,5 @@ PORTNAME= pdm -PORTVERSION= 1.15.5 +PORTVERSION= 2.2.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,20 +12,22 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}blinker>=0:devel/py-blinker@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}click>=7:devel/py-click@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}findpython>=0:devel/py-findpython@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}installer>=0.5.1<0.6:devel/py-installer@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pdm-pep517>=0.9:devel/py-pdm-pep517@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}CacheControl>=0.12.11:www/py-cachecontrol@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}certifi>=2022.6.15:security/py-certifi@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}findpython>=0.2.0:devel/py-findpython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}installer>=0.6<0.7:devel/py-installer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>=20.9:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pdm-pep517>=1.0.0<2.0.0:devel/py-pdm-pep517@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pep517>=0.11.0:devel/py-pep517@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pip>=20.1:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=0:devel/py-platformdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-dotenv>=0.15:www/py-python-dotenv@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0:www/py-requests-toolbelt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}resolvelib>=0.8<0.9:devel/py-resolvelib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rich>=12.3.0:textproc/py-rich@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}shellingham>=1.3.2:devel/py-shellingham@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomlkit>=0.8.0<1:textproc/py-tomlkit@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0.36.2:devel/py-wheel@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}unearth>=0.6.0:devel/py-unearth@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>=20:devel/py-virtualenv@${PY_FLAVOR} USES= python:3.7+ USE_PYTHON= autoplist concurrent distutils @@ -35,12 +37,19 @@ NO_ARCH= yes .include .if ${PYTHON_REL} < 30800 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=0:devel/py-importlib-metadata@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR} +.endif + +.if ${PYTHON_REL} < 31000 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=3.6:devel/py-importlib-metadata@${PY_FLAVOR} +.endif + +.if ${PYTHON_REL} < 31100 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=1.1.0:textproc/py-tomli@${PY_FLAVOR} .endif post-patch: - @${RM} ${WRKSRC}/pyproject.toml +# @${RM} ${WRKSRC}/pyproject.toml @${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py .include diff --git a/devel/py-pdm/distinfo b/devel/py-pdm/distinfo index 04822780fbd5..aba196134b04 100644 --- a/devel/py-pdm/distinfo +++ b/devel/py-pdm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659161175 -SHA256 (pdm-1.15.5.tar.gz) = ea2372588587f59d1523796bbe4caf0302b0ada94e0b858395dd9213f4066ef2 -SIZE (pdm-1.15.5.tar.gz) = 3258852 +TIMESTAMP = 1675191033 +SHA256 (pdm-2.2.1.tar.gz) = a861d47d57bc6ef9e99edb09abd620955a37b2835019b6a8918beea3b089a3b7 +SIZE (pdm-2.2.1.tar.gz) = 2770967 diff --git a/devel/py-pdm/files/setup.py b/devel/py-pdm/files/setup.py index 37888cfc4548..03a76a3b28f7 100644 --- a/devel/py-pdm/files/setup.py +++ b/devel/py-pdm/files/setup.py @@ -5,24 +5,27 @@ import codecs with codecs.open('README.md', encoding="utf-8") as fp: long_description = fp.read() -INSTALL_REQUIRE = [ +INSTALL_REQUIRES = [ 'blinker', - 'click>=7', - 'findpython', - 'importlib-metadata; python_version < "3.8"', - 'installer>=0.5.1,<0.6', - 'packaging', - 'pdm-pep517>=0.9', + 'cachecontrol>=0.12.11', + 'certifi>=2022.6.15', + 'findpython>=0.2.0', + 'importlib-metadata>=3.6; python_version < "3.10"', + 'installer<0.7,>=0.6', + 'packaging>=20.9', + 'pdm-pep517<2.0.0,>=1.0.0', 'pep517>=0.11.0', - 'pip>=20.1', 'platformdirs', 'python-dotenv>=0.15', - 'resolvelib>=0.8,<0.9', + 'requests-toolbelt', + 'resolvelib<0.9,>=0.8', + 'rich>=12.3.0', 'shellingham>=1.3.2', - 'tomli>=1.1.0', - 'tomlkit>=0.8.0,<1', + 'tomli>=1.1.0; python_version < "3.11"', + 'tomlkit<1,>=0.8.0', 'typing-extensions; python_version < "3.8"', - 'wheel>=0.36.2', + 'unearth>=0.6.0', + 'virtualenv>=20', ] ENTRY_POINTS = { 'console_scripts': [ @@ -33,24 +36,20 @@ ENTRY_POINTS = { setup_kwargs = { 'name': 'pdm', 'version': '%%PORTVERSION%%', - 'description': 'Python Development Master', + 'description': 'A modern Python package and dependency manager supporting the latest PEP standards', 'long_description': long_description, 'license': 'MIT', 'author': '', 'author_email': 'frostming ', 'maintainer': None, 'maintainer_email': None, - 'url': 'https://pdm.fming.dev', + 'url': '', 'packages': [ - 'pdm', - 'pdm._vendor', - 'pdm._vendor.colorama', - 'pdm._vendor.halo', - 'pdm._vendor.log_symbols', - 'pdm._vendor.spinners', 'pdm.builders', 'pdm.cli', 'pdm.cli.commands', + 'pdm.cli.commands.publish', + 'pdm.cli.commands.venv', 'pdm.cli.completions', 'pdm.formats', 'pdm.installers', @@ -60,6 +59,7 @@ setup_kwargs = { 'pdm.project', 'pdm.resolver', ], + 'package_dir': {'': 'src'}, 'package_data': {'': ['*']}, 'long_description_content_type': 'text/markdown', 'keywords': ['packaging', 'dependency', 'workflow'], @@ -71,7 +71,7 @@ setup_kwargs = { 'Programming Language :: Python :: 3.10', 'Topic :: Software Development :: Build Tools', ], - 'install_requires': INSTALL_REQUIRE, + 'install_requires': INSTALL_REQUIRES, 'python_requires': '>=3.7', 'entry_points': ENTRY_POINTS, }