git: 4d9eeb51c074 - main - devel/py-omegaconf: update 2.3.1 → 2.4.0

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4d9eeb51c07461e7525efed9475f282bc404d963

commit 4d9eeb51c07461e7525efed9475f282bc404d963
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-10-13 03:12:03 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-10-13 04:25:24 +0000

    devel/py-omegaconf: update 2.3.1 → 2.4.0
---
 devel/py-omegaconf/Makefile | 26 ++++++++++++++++----------
 devel/py-omegaconf/distinfo |  6 +++---
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/devel/py-omegaconf/Makefile b/devel/py-omegaconf/Makefile
index 1dfe7687b351..427af197838e 100644
--- a/devel/py-omegaconf/Makefile
+++ b/devel/py-omegaconf/Makefile
@@ -1,13 +1,12 @@
 PORTNAME=	omegaconf
-DISTVERSION=	2.3.1
-PORTREVISION=	1
+DISTVERSION=	2.4.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Flexible configuration library
-WWW=		https://github.com/omry/omegaconf
+WWW=		https://github.com/hydra-ecosystem/omegaconf
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -15,8 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${ANTLR_JAR}:devel/antlr4
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}antlr4-python3-runtime>=4.13:devel/py-antlr4-python3-runtime@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1.0:devel/py-pyyaml@${PY_FLAVOR}
 
 USES=		java:build python
 
@@ -28,13 +26,21 @@ NO_ARCH=	yes
 
 ANTLR_JAR=	${JAVAJARDIR}/antlr-4.13.2-complete.jar
 
-# tests as of 2.3.1: 10 failed, 7761 passed, 354 skipped, 8 xfailed in 57.22s, failures are because if the missing build_helpers/test_files
-
-# The bundled antlr 4.9.3 generates a parser that the antlr4 runtime in the
-# tree refuses to load, so generate it with devel/antlr4 instead
+# The bundled antlr 4.11.1 generates a parser that we replace with the system antlr4 jar.
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\( *\)"java",$$|\1"${JAVA}",|' \
-		-e 's|str(build_dir / "bin" / "antlr-4.9.3-complete.jar")|"${ANTLR_JAR}"|' \
+		-e 's|str(build_dir / "bin" / "antlr-4.11.1-complete.jar")|"${ANTLR_JAR}"|' \
 		${WRKSRC}/build_helpers/build_helpers.py
 
+pre-test: # skip tests requiring unavailable dependencies/network/website
+	@${RM} ${WRKSRC}/tests/test_dependency_audit.py
+	@${RM} ${WRKSRC}/tests/test_dependency_audit_invariants.py
+	@${RM} ${WRKSRC}/tests/test_dependency_audit_pnpm.py
+	@${RM} ${WRKSRC}/tests/test_dependency_audit_repairs.py
+	@${RM} ${WRKSRC}/tests/test_dependency_audit_workflow.py
+	@${RM} ${WRKSRC}/tests/test_website_api_deprecations.py
+	@${RM} ${WRKSRC}/tests/test_website_examples.py
+
+# tests as of 2.4.0: 11 failed, 8816 passed, 363 skipped (failures are due to missing build_helpers/test_files and release workflow tests)
+
 .include <bsd.port.mk>
diff --git a/devel/py-omegaconf/distinfo b/devel/py-omegaconf/distinfo
index 905fec548b6d..8c986f033b25 100644
--- a/devel/py-omegaconf/distinfo
+++ b/devel/py-omegaconf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1784502602
-SHA256 (omegaconf-2.3.1.tar.gz) = e5e7de64aeebeddaf8e6d3f7a783b32ac2a01c0fbd9c878012caecb891a1f42a
-SIZE (omegaconf-2.3.1.tar.gz) = 3298472
+TIMESTAMP = 1791788636
+SHA256 (omegaconf-2.4.0.tar.gz) = 7e219a70bea371da250285b9c01c7db027bc421722799c2cc4ff14bc4a2a753b
+SIZE (omegaconf-2.4.0.tar.gz) = 3544508