diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile
index df64a57ba8ba..597e30454b64 100644
--- a/devel/py-setuptools_scm/Makefile
+++ b/devel/py-setuptools_scm/Makefile
@@ -1,36 +1,41 @@
 PORTNAME=	setuptools_scm
-PORTVERSION=	5.0.2
+PORTVERSION=	6.3.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Setuptools plugin to manage your versions by scm tags
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
-		git:devel/git \
-		${PY_MERCURIAL}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR}
+TEST_DEPENDS=	git:devel/git \
+		${PY_MERCURIAL} \
+		${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 # Workaround to get a 100% working test suite.  This can be removed once
 # https://github.com/pypa/setuptools_scm/issues/353 is solved.
 TEST_ENV=	_PYTEST_SESSION=yes
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		TOML
 OPTIONS_DEFAULT=	TOML
 
 TOML_DESC=		Support PEP 517/518 (Keep this enabled to avoid build errors)
-TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR}
+TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR}
+
+# Skip integration tests that require a more recent version of py-virtualenv
+post-extract:
+	@${MV} ${WRKSRC}/testing/test_setuptools_support.py ${WRKSRC}/testing/test_setuptools_support.py.dist
 
 do-test:
-	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
+	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/devel/py-setuptools_scm/distinfo b/devel/py-setuptools_scm/distinfo
index 715ab4cad441..ebca578164e8 100644
--- a/devel/py-setuptools_scm/distinfo
+++ b/devel/py-setuptools_scm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1634646880
-SHA256 (setuptools_scm-5.0.2.tar.gz) = 83a0cedd3449e3946307811a4c7b9d89c4b5fd464a2fb5eeccd0a5bb158ae5c8
-SIZE (setuptools_scm-5.0.2.tar.gz) = 52273
+TIMESTAMP = 1631813313
+SHA256 (setuptools_scm-6.3.2.tar.gz) = a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2
+SIZE (setuptools_scm-6.3.2.tar.gz) = 57207