Patch: https://people.FreeBSD.org/~sunpoet/patch/devel-py-setuptools_scm.txt devel/py-setuptools_scm: Update to 6.3.2 Changes: https://github.com/pypa/setuptools_scm/releases https://github.com/pypa/setuptools_scm/blob/main/CHANGELOG.rst
6.3.3 may be out soon There's been several dependency and dependency version changes (toml -> tomli among others), so keep an eye out to match all these
(In reply to Po-Chuan Hsieh from comment #0) Thank you for the patch, I started with the QA and if everything looks good, the 6.3.2 (or 6.3.3) release should be in the Ports tree soon. One question: Is there a reason why ${TEST_WRKSRC} is changed back to ${WRKSRC}? (for reference, please see https://wiki.freebsd.org/Python/PortsPolicy#Tests) (In reply to Kubilay Kocak from comment #1) The 6.x release contains too much changes in contrast to the 5.x release and it also has some dependency changes, so I'd refrain to do a MFH.
(In reply to Kai Knoblich from comment #2) > One question: Is there a reason why ${TEST_WRKSRC} is changed back to ${WRKSRC}? I would only use TEST_WRKSRC when it differs from WRKSRC. I see no real benefit to use TEST_WRKSRC over WRKSRC in a specific port. It is meaningful to use TEST_WRKSRC in the framework (e.g. USES=foo) or a shared Makefile/script used by many ports because it provides the flexibility to fit various conditions.
Created attachment 229375 [details] py-setuptools_scm-6.3.2.patch Attached is a rebased patch of sunpoet@'s original patch with a small addition to get a working testsuite. The testsuite makes use of devel/py-virtualenv but requires a more recent version of it. This will be noted explicitly in the next release of devel/py-setuptools_scm: https://github.com/pypa/setuptools_scm/commit/b2a2e3982d0c0ba31d902e68b94b9bded3cbe13a The tests that use virtualenv works fine with a local version of virtualenv. By the way, the TOML option will diseappear with the next release as well: https://github.com/pypa/setuptools_scm/commit/0d3d694930e85b2277c148c7b02b1f4e29b2a79e I still need some time for QA and if everything goes well, setuptools_scm 6.3.2 should land to the end of this week. (In reply to Po-Chuan Hsieh from comment #3) Thanks for the pointers!
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=49540e2bf14bd4553e050ca2663e06c2a50c80aa commit 49540e2bf14bd4553e050ca2663e06c2a50c80aa Author: Kai Knoblich <kai@FreeBSD.org> AuthorDate: 2021-11-12 11:16:32 +0000 Commit: Kai Knoblich <kai@FreeBSD.org> CommitDate: 2021-11-12 11:16:32 +0000 devel/py-setuptools_scm: Update to 6.3.2 [1] * Sort variables and use WRKSRC instead TEST_WRKSRC as the latter should be only used if it differs from WRKSRC. [1] * Exclude some tests that require a more recent version of devel/py-virtualenv for now. Changelog since 5.0.2: https://github.com/pypa/setuptools_scm/blob/v6.3.2/CHANGELOG.rst PR: 259445 Reported by: sunpoet [1] MFH: No (feature release with new dependencies) devel/py-setuptools_scm/Makefile | 19 ++++++++++++------- devel/py-setuptools_scm/distinfo | 6 +++--- 2 files changed, 15 insertions(+), 10 deletions(-)
Committed, thanks!