From nobody Mon Jan 22 06:56:15 2024 X-Original-To: dev-commits-ports-main@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 4TJLbg56nFz57Fj3; Mon, 22 Jan 2024 06:56:15 +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 4TJLbg4BzMz432Z; Mon, 22 Jan 2024 06:56:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705906575; 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=aUTdDeRK1mSn7wLFb7hG6bNB4msIReeatGj4giqahMc=; b=x71GpGBIcULYMewpW8lgkBL1KrrQNDPc9XvP4PTWGA7eCTTJbiz0W5vObG0ds7Nz2zKn9J kxW5b57gVlDb+P7Rq7vh5OHhsT+DSb1HemuJv93lM/MfV7lEjHhoFOW0XmVGGZjYTWj8mO L/xHGy4C7opARGACgRXfsidbw6VgXZZKtwEPj80I+0snVt+hXKErt9q9fLzs1HLooMbJmV yr8fewa3SxdMgSW5PGQkifef0NlkUcCK5OtegHEU/OsLs1kw/TTEb9tRqCz85973SNrXFG MC5yRsHaF5NEwTYno7Wb0qnQBZX4Sz/sFqu5edI5CNi6oKqN7o5t69dMXquzUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705906575; 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=aUTdDeRK1mSn7wLFb7hG6bNB4msIReeatGj4giqahMc=; b=GD05rLm/zhlqrWJSFfq4yBrgSueNkab9VXUTGvpZAZZbLkes4bzfcoYS7pCPq/MfUKGfZb l7IFlaz9XBAf4Y3awg8qsLK8eaBQ5nkAPXsnOoG6/UYt9XI3kn9wA6SEyEAhnsO7Ep/aBF rySBb24sq0ztuETsTfNZwmSf2qZ5iRlxcUKEcbn2cHu+Rc8YgqQXOjihP3QroapiQhSo4U jssfWywExLxmLtUbHQSuMxELbL3p3MEBBPDPH6yLsrAI0vONGE8HdhRA/OnKBFd5XKwnyJ e2zyS5yf+TXYu8BUP7ltk9OmeNWuR9S1QqJydJwMupV77rGkZtqNsMgsAs3y6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705906575; a=rsa-sha256; cv=none; b=C+VtIpJ10PStK//wOvXwFroGEEqhhfW4+H2hTH0ogwAQ83Eey+mhqjv0oiWuNA/FcXEtdI 6yh6J/bvQsfTzft6E+ukpO+I6uwUANQweZm4laxgBFGCjG3tHGqxjfp7gKj58nz4KQ42kl zvt7m75XtIzjwh8PkeFD8OSq6xdIJN/AnHgQtIo4tjLQH1XHwTE2GZCJp4BZ4mJKFSt/+L 0BuccOC4Eqj3Cq2mPeCJc1yh2PdZJ5MCkxJpuho5r/5xKfsc1YZWSbvxs7p+kANVhBsKGD 9RRn5qyM9MG/kB59wplNoQ1unL8jkqMEVvvTBZj2U4Pgd/2Ty5wAiedasLR+AA== 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 4TJLbg3C6pzrW2; Mon, 22 Jan 2024 06:56:15 +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 40M6uFxc041340; Mon, 22 Jan 2024 06:56:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40M6uF6U041337; Mon, 22 Jan 2024 06:56:15 GMT (envelope-from git) Date: Mon, 22 Jan 2024 06:56:15 GMT Message-Id: <202401220656.40M6uF6U041337@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 37393e7794f0 - main - science/py-qcengine: Fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 37393e7794f04372d047538ad6b76f9a535c387a Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=37393e7794f04372d047538ad6b76f9a535c387a commit 37393e7794f04372d047538ad6b76f9a535c387a Author: Yuri Victorovich AuthorDate: 2024-01-22 06:54:31 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-22 06:54:31 +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 --- 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} \