Newer setuptools_scm uses a different TOML parser, py-tomli; port attached.
OK to import? There's some slight mess, we don't handle distutils
ports without setup.py yet, so there's a patch to add a tweaked
file from an old upstream version.

The scm diff to go with it is below (this one is needed by newer
setuptools_rust).

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile    26 Feb 2022 22:17:51 -0000      1.23
+++ Makefile    26 Feb 2022 22:19:43 -0000
@@ -1,9 +1,8 @@
 # $OpenBSD: Makefile,v 1.23 2022/02/26 22:17:51 sthen Exp $
 
 COMMENT =              plugin to manage your versions by scm tags
 
-# >=6.1 needs py-tomli
-MODPY_EGG_VERSION =    6.0.1
+MODPY_EGG_VERSION =    6.4.2
 DISTNAME =             setuptools_scm-${MODPY_EGG_VERSION}
 PKGNAME =              py-${DISTNAME}
 CATEGORIES =           devel
@@ -24,7 +23,7 @@ TEST_DEPENDS =                ${FULLPKGNAME}:${FULLPKG
                        devel/mercurial \
                        devel/py-pip${MODPY_FLAVOR}
 
-# >=6.1 needs py-tomli
-RUN_DEPENDS +=         textproc/py-toml${MODPY_FLAVOR}
+RUN_DEPENDS +=         textproc/py-tomli${MODPY_FLAVOR}
+BUILD_DEPENDS +=       textproc/py-tomli${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo    26 Feb 2022 22:17:51 -0000      1.12
+++ distinfo    26 Feb 2022 22:19:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (setuptools_scm-6.0.1.tar.gz) = 
0ZJaacsH6bKUFqJ1ufrbAJojwUis6QWy+yIGSabBjpI=
-SIZE (setuptools_scm-6.0.1.tar.gz) = 51433
+SHA256 (setuptools_scm-6.4.2.tar.gz) = 
aDOsZcbtlxGk1dImb4Akz6B8UzoOVfTBL27/KApanjA=
+SIZE (setuptools_scm-6.4.2.tar.gz) = 61305
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-setuptools_scm/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   26 Feb 2022 22:17:51 -0000      1.5
+++ pkg/PLIST   26 Feb 2022 22:19:43 -0000
@@ -14,6 +14,10 @@ lib/python${MODPY_VERSION}/site-packages
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}_entrypoints.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}_overrides.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}_version_cls.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}discover.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}file_finder.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,10 +26,16 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}hacks.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}hg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}hg_git.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}integration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}scm_workdir.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 @comment 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/${MODPY_PYCACHE}win_py31_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/_entrypoints.py
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/_overrides.py
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/_types.py
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/_version_cls.py
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/config.py
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/discover.py
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/file_finder.py
@@ -34,7 +44,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/git.py
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/hacks.py
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/hg.py
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/hg_git.py
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/integration.py
+lib/python${MODPY_VERSION}/site-packages/setuptools_scm/scm_workdir.py
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/utils.py
 lib/python${MODPY_VERSION}/site-packages/setuptools_scm/version.py
 @comment 
lib/python${MODPY_VERSION}/site-packages/setuptools_scm/win_py31_compat.py

Attachment: py-tomli.tgz
Description: application/tar-gz

Reply via email to