From nobody Fri Dec 30 09:13:14 2022 X-Original-To: dev-commits-ports-all@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 4Nk00q2RKjz2kfBk; Fri, 30 Dec 2022 09:13: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 4Nk00q1WRxz4F7B; Fri, 30 Dec 2022 09:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391595; 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=RyFCoY3Q00A40cmgW0TwpP/BtKL11YarbXDT0Uv0WM4=; b=WKP+hLg92TPfuc3B1drsdzvEAmBl5u1Ys/YL44kMDgIDbjn5CsnVzImbnNTDZ3zd9xGXhy FBp6PNnGhHoAj87rk5YC9xEaQT/NAuw4mkRtTQx34PyPAf8sXHPElhQ9k4a1Al+G3p1ZQC pXcUBILZMwJcOMJl4XP2rVY5ly41WB6WOlPf5OZF2awQXKeAPjsbexy5FUFfaRpB6bzj9w uE18ClixTvB4C9+B+hdN0hCOwpejtAwi06BB9ebQJl4UC8tcMC2Vs15n7N92Zu6n0PuAxX cDRKdoL2IUm8M4t5fBRMXsZLtiJouO0CwTpevm+ACdRUeABvIsPzlEAmR3GEdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672391595; 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=RyFCoY3Q00A40cmgW0TwpP/BtKL11YarbXDT0Uv0WM4=; b=NenI/JzzA77dJuTNp6Jf0M6z8LkaWO8aNjo75NcaPPD1u4mk8e02KHK6bzZeAL0PH7nKEH 4IZ3NtyjQfgpZUi6QKYcHGZXH92IzBM9bPddteSn/7XMUBe9NczkopL8ULaZmZtJDCzLx+ bELtVj5cz7OwUqcV1/gY/FD2JFY9y57sRKYQrZc8R0P6Vtb8ClwnqdojJfDCp/eC1Ex8pz WeBn6dqrAFqleV3P2vbafZqPZEcsgJwn65J1Jq10wRfHPcNui9kEOFqgGSOw2NkpzxsoAJ Kjz+3JPfhcDfxI4/+69aE9eykXA8CpSm8bgQNpla0GfOoVltm9BcfkyeknFxfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672391595; a=rsa-sha256; cv=none; b=Nnb+zwQ2zm1Qkv9duFI6b4m/kwdBNmZHDE/RqNRUJOJ/r7MQ/9y24FpKc5Ii2z64iT2EqP /Tl9/MNnkA2O/2sMn1ogBGfXcIXYAZugeFMlqeMOrjy/6OZQOgm/2uvzhZ/KsEyfbeat+8 tI7BoG70WMwJm15q9sVBhPSZteIqdYodr09qRSzvijvFFuHpfUOEDr8eijKnRcq3dndkrM Oa5ZD8Nkn6sUYJ90/Yn2VF677p/zrnPCITYEqwT2ns7f0N6LBA/jeZ2Z7VdQvU9Ir9Tw6x tdlEgkEYw/fr+pBR+BbRdk6tOR9Zbn5IZzaQLjN0FJgVWnyKoUAnPq3s3Rg/BA== 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 4Nk00q0Y7Yz13ZF; Fri, 30 Dec 2022 09:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BU9DEjk019897; Fri, 30 Dec 2022 09:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BU9DECB019896; Fri, 30 Dec 2022 09:13:14 GMT (envelope-from git) Date: Fri, 30 Dec 2022 09:13:14 GMT Message-Id: <202212300913.2BU9DECB019896@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: 90657ebb4146 - main - www/py-requests: Allow build with py-charset-normalizer 3.x List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 90657ebb4146ac4674aea2ae891ef125b79b48d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=90657ebb4146ac4674aea2ae891ef125b79b48d4 commit 90657ebb4146ac4674aea2ae891ef125b79b48d4 Author: Po-Chuan Hsieh AuthorDate: 2022-12-30 08:46:48 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-12-30 09:05:15 +0000 www/py-requests: Allow build with py-charset-normalizer 3.x - Bump PORTREVISION for package change Obtained from: https://github.com/psf/requests/commit/c57f1f0ca10e61771b459c857182c23626607312 --- www/py-requests/Makefile | 3 ++- www/py-requests/files/patch-charset-normalizer | 37 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile index 4054eb0624d2..15791fce9be0 100644 --- a/www/py-requests/Makefile +++ b/www/py-requests/Makefile @@ -1,5 +1,6 @@ PORTNAME= requests PORTVERSION= 2.28.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,7 +13,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2<3:textproc/py-charset-normalizer@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2<4:textproc/py-charset-normalizer@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}idna>=2.5<4:dns/py-idna@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1,1<1.27,1:net/py-urllib3@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR} \ diff --git a/www/py-requests/files/patch-charset-normalizer b/www/py-requests/files/patch-charset-normalizer new file mode 100644 index 000000000000..08e9a348b36d --- /dev/null +++ b/www/py-requests/files/patch-charset-normalizer @@ -0,0 +1,37 @@ +Obtained from: https://github.com/psf/requests/commit/c57f1f0ca10e61771b459c857182c23626607312 + +--- requests/__init__.py.orig 2022-06-29 15:09:45 UTC ++++ requests/__init__.py +@@ -80,8 +80,8 @@ def check_compatibility(urllib3_version, chardet_versi + elif charset_normalizer_version: + major, minor, patch = charset_normalizer_version.split(".")[:3] + major, minor, patch = int(major), int(minor), int(patch) +- # charset_normalizer >= 2.0.0 < 3.0.0 +- assert (2, 0, 0) <= (major, minor, patch) < (3, 0, 0) ++ # charset_normalizer >= 2.0.0 < 4.0.0 ++ assert (2, 0, 0) <= (major, minor, patch) < (4, 0, 0) + else: + raise Exception("You need either charset_normalizer or chardet installed") + +--- setup.cfg.orig 2022-06-29 15:13:33 UTC ++++ setup.cfg +@@ -5,7 +5,7 @@ provides-extra = + use_chardet_on_py3 + requires-dist = + certifi>=2017.4.17 +- charset_normalizer>=2,<3 ++ charset_normalizer>=2,<4 + idna>=2.5,<4 + urllib3>=1.21.1,<1.27 + +--- setup.py.orig 2022-06-29 15:09:45 UTC ++++ setup.py +@@ -59,7 +59,7 @@ if sys.argv[-1] == "publish": + sys.exit() + + requires = [ +- "charset_normalizer>=2,<3", ++ "charset_normalizer>=2,<4", + "idna>=2.5,<4", + "urllib3>=1.21.1,<1.27", + "certifi>=2017.4.17",