From nobody Mon Jan 22 06:56:35 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TJLc42pyfz57G15; Mon, 22 Jan 2024 06:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TJLc36mTsz43Zt; Mon, 22 Jan 2024 06:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705906596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7GDzFwG0md9oqXD29IU7EJXGtnCV0jv7x6LQNy5HDHE=; b=vNHVC2R8YcCHbAQmmnFwHar6yIWClInScjrkgUfMAxKHc4J1XgPHdPgC7qaqQl/q8Up8nt vuMs37tefxpPwr+4udKS8744gMu1o9RJYPyVPiEJteePsiu5m3Op6SQx998oD3t1t0401B gBF7ajxC8lW4WPshtYc9Za1aU9ombfe6p3ViOVR1JwXDkAI1IZUFNOiJGF76hKaATkfU9t VHDpfXpQxa4bpzH2UqCLVtsiG1D/8pkxHiafG4uhHsunHVnpwtu5ZWthYaxV00k430JR3I GyGqgZFtIsGnsqDz7bs24JJsW+j2SuiKSSmn0F9EGVfF9OtEJtfRU3H45ffMaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705906596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7GDzFwG0md9oqXD29IU7EJXGtnCV0jv7x6LQNy5HDHE=; b=Ucrmkptj22rJDHy+w0JLUIkeDBpUS2nMtEsV9HTzhyAUMKHe57i1oa0+WRhZusvaw/okXN kxAiCujwsC7n4UVP41AnVwwiaLVHdOKr1Nk9xrvrawJiV150HWP7ts3kQJgTIMLJfeQ8pT cxa/NByz9f39AzmvXxC7yp5+rF+mVH16ebyCICX/MmLMlbjiwUrKgh5DydmkAN+IYN2vkA eoAuprApQ7yE69lk+oxzoBrmUr2WYhRPoGF6GKEL/CtFGZ6MakwCbgxzfKjA0pH9SoNf8/ xjsMZtFlnU95UuPeRLMLAZVrADxY4oXdP5p/JaetddlfUCvKRLVBU1yXjnknVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705906596; a=rsa-sha256; cv=none; b=SCjXBFsQTTyoU9o84l4yNjgKqI70AOLOFpCvH846sxDIW+SlJkveVxd8oyIDjYqB7jOX11 Y97/fqtvdBzqH8km2sI8aR1oq2hrW0N0xYliqY9xszcl6nr4IfU1fnJ90hNX40+1AzCLcI 9e81JfdSO4HUVeuZvXtXCUs1CsPN7OA/2BRIYqb/Zni/TiUZ/sY2GVz2OMSZ/y+uddsGCH pBTdjD/4JsQKfCbKqZw1Ib6gR0lofFiaiIOyY6J+X/ynF0FsyI9qvwfMustBQyI2XMa3y2 UPh6HLQZxLlJrSAaoMHAJG1H+w3Q9G/M+mY5fi0eu62ma6J/saHg2SUtZKSjag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TJLc35F8jzrqs; Mon, 22 Jan 2024 06:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40M6uZGA041516; Mon, 22 Jan 2024 06:56:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M6uZ8Z041513; Mon, 22 Jan 2024 06:56:35 GMT (envelope-from git) Date: Mon, 22 Jan 2024 06:56:35 GMT Message-Id: <202401220656.40M6uZ8Z041513@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Yuri Victorovich Subject: git: 69c842b3c0de - 2024Q1 - science/py-qcengine: Fix build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 69c842b3c0de7efb3ddecf46e606aa252fcd96e0 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=69c842b3c0de7efb3ddecf46e606aa252fcd96e0 commit 69c842b3c0de7efb3ddecf46e606aa252fcd96e0 Author: Yuri Victorovich AuthorDate: 2024-01-22 06:54:31 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-22 06:56:30 +0000 science/py-qcengine: Fix build The build was broken by the py-pydantic disaster when some ports depend on pydantic1 and some - on pydantic2, which are 2 conflicting incompatible versions of the same pydantic package. Reported by: fallout (cherry picked from commit 37393e7794f04372d047538ad6b76f9a535c387a) --- science/py-qcengine/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/science/py-qcengine/Makefile b/science/py-qcengine/Makefile index c8f6ba838555..676ebde9fdc1 100644 --- a/science/py-qcengine/Makefile +++ b/science/py-qcengine/Makefile @@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}py-cpuinfo>0:sysutils/py-py-cpuinfo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pydantic>=1.8.2:devel/py-pydantic@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pydantic2>=1.8.2:devel/py-pydantic2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}qcelemental>=0.24.0:science/py-qcelemental@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \