From nobody Wed Feb 21 15:23:32 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 4Tg0R91n7Lz59gWm; Wed, 21 Feb 2024 15:23:33 +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 4Tg0R85gkQz47g8; Wed, 21 Feb 2024 15:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708529012; 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=Bddwg1RDBfIlpFiatjZgo2d67wyIUPW6y5cPVSdTLi8=; b=ZJy+BipVmtTx9PL4YqWSmcsnkaXClTVTCELDLTWgQLWLJBDqgeNcU2kNRS3gfU3Yi16MAi qqG6NpQZ70cwoPpGT3FQgbkQL6Tlrm4k9XeO0Rl5Ffp+P2/Wo65Y7b5YshBmexcRVj06eL sTAStbVOj7IALGfo5exi/eqINATvOmDD2m3PFncsOQfu5wW01delj758prYlQrbk0EFOzt hH0DnwPlT8UWqswA1maK46cF4B3b1lhbLA0m1CQqR9eb9gVhnaE43uaLwjl5Yungi7vlzH 4cT1UDVSMHFfPIBdiDokXxmGy9IZXmt/cndBJmVKYqyoFLcSFs7WGHwWmCitfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708529012; 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=Bddwg1RDBfIlpFiatjZgo2d67wyIUPW6y5cPVSdTLi8=; b=T+oFPeAVdVM9qmR0GnPls1rxEECWMKrTZpdKJuV0d2LGYaKLjQT654auZLnu70gsddcY77 Bni+cXPx+KyHgtuuHYvjC19cdgPVLIoQ19dkDp1Ic29qsxedl+Cp4UTZwqrzoYMdLeZkBJ Cq66qRgqnHEhg877XpFpzDY0cWXtmIuXiRoVnA5AeiaIXyaI+tpKZRQTDf4ZJxRerlclBA okFJoPyWtuhQ6j9WjfmW8h19EzrQ2kxbRAJop0liI3WNNYVewZU9e0PQN/zN1cEeLqrfcn Y5vHjsZQ0jmuD6YcToMYUMA8MWruE0QNEdx1EEif76H9QoSoZJcbGVIdTd2SEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708529012; a=rsa-sha256; cv=none; b=fX2hg6kT+OE9krxTb5rlvJAOsfPFLPl9qR/3g0lln81l2ikDHmLlfUmYQ9+eiiZDOq3sJz ukeT7lllj7tSj3N9T0UPre7l0S3MwLWuzbfzBdxCW6Fj++A+QDjJH2MM6ig0KM8aBxM0Ga T8STSuicglQ21NUiVhdztZ2J7oY3v8H/nzw8Tz53bZJBnzcrymPtb/VeTHe/FgXE+kQjr3 YUFhXrayjdvulcLDGpA3n5mZZfFaKmVGihYYB+xrHH1OcXL4xnapt7uMEH38BltVbBqg6D jsAWdIDwrvLEnj+BD8vIk+/wIEDT9LLuhznmvfg8ufJSH70kU3Y83n8nC39sZg== 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 4Tg0R84ncLz17VT; Wed, 21 Feb 2024 15:23:32 +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 41LFNWfG041579; Wed, 21 Feb 2024 15:23:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFNWbE041576; Wed, 21 Feb 2024 15:23:32 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:23:32 GMT Message-Id: <202402211523.41LFNWbE041576@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 9c210de370d4 - main - devel/py-poetry: Revert 1034b67935210a4521d99862c6043180e662423b 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c210de370d43ff61c08908428bd93fa45a18262 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c210de370d43ff61c08908428bd93fa45a18262 commit 9c210de370d43ff61c08908428bd93fa45a18262 Author: Po-Chuan Hsieh AuthorDate: 2024-02-21 14:38:56 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-02-21 15:07:36 +0000 devel/py-poetry: Revert 1034b67935210a4521d99862c6043180e662423b --- devel/py-poetry/Makefile | 4 ++-- devel/py-poetry/distinfo | 6 +++--- devel/py-poetry/files/patch-pyproject.toml | 11 +++++++++++ 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/devel/py-poetry/Makefile b/devel/py-poetry/Makefile index d86393eeac61..5e39ffd5cd0e 100644 --- a/devel/py-poetry/Makefile +++ b/devel/py-poetry/Makefile @@ -1,5 +1,5 @@ PORTNAME= poetry -PORTVERSION= 1.7.1 +PORTVERSION= 1.6.1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poetry-core>=1.5.0:devel/py-poetry-core@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>=0.10.0<0.11:devel/py-build@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.13.0:www/py-cachecontrol@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cachecontrol>=0.13.0<0.14:www/py-cachecontrol@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cleo>=2.0.0<3:devel/py-cleo@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}crashtest>=0.4.1<0.5:devel/py-crashtest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dulwich>=0.21.2<0.22:devel/py-dulwich@${PY_FLAVOR} \ diff --git a/devel/py-poetry/distinfo b/devel/py-poetry/distinfo index df3dadf73161..d0b7c74914f5 100644 --- a/devel/py-poetry/distinfo +++ b/devel/py-poetry/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707047851 -SHA256 (poetry-1.7.1.tar.gz) = b348a70e7d67ad9c0bd3d0ea255bc6df84c24cf4b16f8d104adb30b425d6ff32 -SIZE (poetry-1.7.1.tar.gz) = 1483927 +TIMESTAMP = 1692812418 +SHA256 (poetry-1.6.1.tar.gz) = 0ab9b1a592731cc8b252b8d6aaeea19c72cc0a109d7468b829ad57e6c48039d2 +SIZE (poetry-1.6.1.tar.gz) = 1475487 diff --git a/devel/py-poetry/files/patch-pyproject.toml b/devel/py-poetry/files/patch-pyproject.toml new file mode 100644 index 000000000000..53175b20eac1 --- /dev/null +++ b/devel/py-poetry/files/patch-pyproject.toml @@ -0,0 +1,11 @@ +--- pyproject.toml.orig 2023-08-21 17:52:54 UTC ++++ pyproject.toml +@@ -43,7 +43,7 @@ importlib-metadata = { version = ">=4.4", python = "<3 + installer = "^0.7.0" + # jsonschema 4.18 uses Rust-based libraries which causes issues when building from source + jsonschema = ">=4.10.0,<4.18.0" +-keyring = "^24.0.0" ++keyring = ">=23.9.0,<25" + # packaging uses calver, so version is unclamped + packaging = ">=20.4" + pexpect = "^4.7.0"