devel/py-pdm: Update to 2.2.1

- Allow build with py-installer 0.6.0+

Changes:	https://github.com/pdm-project/pdm/releases

3 files changed, 45 insertions, 36 deletions

diff --git a/devel/py-pdm/Makefile b/devel/py-pdm/Makefile
index 6f14df17339b..af7c47bb0480 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=	PYPI
 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 <bsd.port.pre.mk>
 
 .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 <bsd.port.post.mk>
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 <mianghong@gmail.com>',
     '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,
 }