From nobody Fri Mar 25 17:20:21 2022 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 3542E1A3032A; Fri, 25 Mar 2022 17:20:22 +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 4KQ8456cPHz3p9p; Fri, 25 Mar 2022 17:20:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648228822; 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=jFeLFtEBBtok2CVFzmhsmqZA9157gqiWX1/RHFvzt5A=; b=YUpMxagMUi/kSdu23o2AI7doSlQak9wneNLzEdjackgPaoYC4pV/ukOs79vzJflYMNz59/ 8IqmVRqVPmD+fTh/b4QKkvRFth6GaamhZI3l8yqS2QghmEXJBzUfNg1hNU/3DYU2i3ZfJ2 GpCkMge/DtEMkLeLFWKcqk8QUK1JVMEukCKEdioMpp/ZQMdcgjK/CyHVPSQDewfVTOSlhP rxHvbXGgwVN1NfDqM8W8KV92zHJaYy2AlX9L4gQT4cVKkmAO7tBgB58z/Fxw8g1z27bOMS 3XZnbW+3A/NhmaS9zsohl9tpddBFHB5IL9zmOlV41oAiD4v8qrDaDVMmAHvOaw== 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 ABF9410970; Fri, 25 Mar 2022 17:20:21 +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 22PHKL2x025686; Fri, 25 Mar 2022 17:20:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PHKLOD025684; Fri, 25 Mar 2022 17:20:21 GMT (envelope-from git) Date: Fri, 25 Mar 2022 17:20:21 GMT Message-Id: <202203251720.22PHKLOD025684@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: fb5f8f301150 - main - www/py-requests: Fix build with py-idna 3.* 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: fb5f8f301150da3a6cbd7b395788cb057fca6e9a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648228822; 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=jFeLFtEBBtok2CVFzmhsmqZA9157gqiWX1/RHFvzt5A=; b=DBUTIgG7t+d9ZKlEMNV5BhYPkY1VfywJB9FH+qKivqD9/LV/Kl8zdCGqLawDzvJfRnqmXk T10MfQNfpQC1gTc79UvXZoCFMTXL2JBFvd8uKREyy8ma9VbCOn7kZa9abr1HfgCF64PNwo ZddLZyRIH7SXmMWc8opzP3uTnv7yvZYGC79qs5RN3s/quz1XsIFck+lUa0zXgH01WZfIme SenckiNoFhRp4Sv6ZXAEujsjYPahAz/7hU7IyZWCRj1wdxiBfbt84v3FNJr8f3G9Bm6eOk gxmyehhz6dy3dE1j3iJpxgdEcTesz+S3hkJRoOQd88FNLGDLi7i/1MM2aKzyLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648228822; a=rsa-sha256; cv=none; b=Hs1FMtVbTDRAVICMj17Q07CxQbH6xriJbuJcae+dDMrmUAR3Db1DkcVoB+CTnM0qce7PSO AqR3xk2OvIsB4FZeNcmc86zJuc8kclduq2oBGymRtZB+ktG7EInIEPUM2xoY5gJFit0qKS i4jL0RZeE6I0G2VetNkE3u3LUMXmLE1e1vZjJ4IVXqZ25mB/11JCd4NtMRKfxxcy4pdToe elCmVfCu5Z1QG5EU74F18mgIoOnlBBZM3T0afsme/l710ywjS2jSdGBVBrdHoI/0/usWOw 4RlRJ5x4idQSNhgX518gRZMoOOm3Rt/LzoKCmSoQ3E2amDDLp7SrwN5CrvL9OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb5f8f301150da3a6cbd7b395788cb057fca6e9a commit fb5f8f301150da3a6cbd7b395788cb057fca6e9a Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 17:15:39 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 17:19:24 +0000 www/py-requests: Fix build with py-idna 3.* - Update version requirement of *_DEPENDS - Clean up TEST_DEPENDS - Update do-test: - Bump PORTREVISION for package change --- www/py-requests/Makefile | 23 +++++++++++------------ www/py-requests/files/patch-setup.py | 11 +++++++++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile index 5795da3f24a3..0f240f59bbfa 100644 --- a/www/py-requests/Makefile +++ b/www/py-requests/Makefile @@ -2,6 +2,7 @@ PORTNAME= requests PORTVERSION= 2.25.1 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,17 +14,15 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=2017.4.17:security/py-certifi@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}idna>=2.5:dns/py-idna@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}urllib3>=1.21.1:net/py-urllib3@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=2.8.0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-httpbin>0:devel/py-pytest-httpbin@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}httpbin>0:www/py-httpbin@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}blinker>0:devel/py-blinker@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2,1<5,1:textproc/py-chardet@${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} \ + ${PYTHON_PKGNAMEPREFIX}pytest>=3,1:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-httpbin>=0.0.7:devel/py-pytest-httpbin@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0,1:devel/py-pytest-xdist@${PY_FLAVOR} USES= cpe python:3.6+ USE_PYTHON= autoplist concurrent distutils @@ -42,6 +41,6 @@ SECURITY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.3.4:security/py-cry SOCKS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR} do-test: - @cd ${WRKSRC} && pytest tests -v + cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v .include diff --git a/www/py-requests/files/patch-setup.py b/www/py-requests/files/patch-setup.py new file mode 100644 index 000000000000..601ce557a7df --- /dev/null +++ b/www/py-requests/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2020-12-16 17:43:25 UTC ++++ setup.py +@@ -43,7 +43,7 @@ packages = ['requests'] + + requires = [ + 'chardet>=3.0.2,<5', +- 'idna>=2.5,<3', ++ 'idna>=2.5,<4', + 'urllib3>=1.21.1,<1.27', + 'certifi>=2017.4.17' +