Attachment 232329 Details for Bug 262399 – Update py-requests to 2.27.1, add the "socks" and "use_chardet_on_py3" option, fix test and change PORTVERSION to DISTVERSION

[patch] Update py-requests to 2.27.1, add the "socks" and "use_chardet_on_py3" option, fix test and change PORTVERSION to DISTVERSION

0001-Update-py-requests-to-2.27.1.patch (text/plain), 4.68 KB, created by Niclas on 2022-03-08 21:44:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Niclas

Created: 2022-03-08 21:44:25 UTC

Size: 4.68 KB

patch

obsolete

>From 7cee0bb3f3e2474ab39136de0845d8507c56e78d Mon Sep 17 00:00:00 2001
>From: Niclas Carlsson <n_carlsson@outlook.com>
>Date: Tue, 8 Mar 2022 22:28:23 +0100
>Subject: [PATCH] Update py-requests to 2.27.1,
>add the "socks" and "use_chardet_on_py3" option, fix test and change PORTVERSION to DISTVERSION
>
>---
> www/py-requests/Makefile                      | 26 ++++++++++++-------
> www/py-requests/distinfo                      |  6 ++---
> .../files/patch-tests_test__requests.py       | 12 ---------
> www/py-requests/pkg-descr                     |  2 +-
> 4 files changed, 21 insertions(+), 25 deletions(-)
> delete mode 100644 www/py-requests/files/patch-tests_test__requests.py
>
>diff --git a/www/py-requests/Makefile b/www/py-requests/Makefile
>index 1b7c6ef07..d355597df 100644
>--- a/www/py-requests/Makefile
>+++ b/www/py-requests/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Olivier Duchateau <duchateau.olivier@gmail.com>
> 
> PORTNAME=	requests
>-PORTVERSION=	2.25.1
>+DISTVERSION=	2.27.1
> CATEGORIES=	www python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -13,25 +13,33 @@ 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} \
>+
>+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pytest>=3: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}trustme>0:security/py-trustme@${PY_FLAVOR}
> 
>-USES=		cpe python:3.6+
>-CPE_VENDOR=	python
>+USES=		python:3.6+
> USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>+OPTIONS_DEFINE=		SOCKS USE_CHARDET_ON_PY3
>+OPTIONS_DEFAULT=	SOCKS
>+
>+USE_CHARDET_ON_PY3_DESC=	Use chardet instead of charset-normalizer
>+
>+SOCKS_RUN_DEPENDS=			${PYTHON_PKGNAMEPREFIX}pysocks>=1.5.6:net/py-pysocks@${PY_FLAVOR}
>+USE_CHARDET_ON_PY3_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}chardet>=3.0.2:textproc/py-chardet@${PY_FLAVOR}
>+USE_CHARDET_ON_PY3_RUN_DEPENDS_OFF=	${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2.0.0:textproc/py-charset-normalizer@${PY_FLAVOR}
>+
> do-test:
>-	@cd ${WRKSRC} && pytest tests -v
>+# https://github.com/psf/requests/issues/5846
>+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} pytest -v -ra tests --deselect tests/test_requests.py::TestRequests::test_pyopenssl_redirect)
> 
> .include <bsd.port.mk>
>diff --git a/www/py-requests/distinfo b/www/py-requests/distinfo
>index 7787211fb..daef5a872 100644
>--- a/www/py-requests/distinfo
>+++ b/www/py-requests/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1609030585
>-SHA256 (requests-2.25.1.tar.gz) = 27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804
>-SIZE (requests-2.25.1.tar.gz) = 102161
>+TIMESTAMP = 1646773503
>+SHA256 (requests-2.27.1.tar.gz) = 68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61
>+SIZE (requests-2.27.1.tar.gz) = 106758
>diff --git a/www/py-requests/files/patch-tests_test__requests.py b/www/py-requests/files/patch-tests_test__requests.py
>deleted file mode 100644
>index c29b374e5..000000000
>--- a/www/py-requests/files/patch-tests_test__requests.py
>+++ /dev/null
>@@ -1,12 +0,0 @@
>-# https://github.com/psf/requests/issues/5530
>---- tests/test_requests.py.orig	2020-12-16 17:43:25 UTC
>-+++ tests/test_requests.py
>-@@ -838,7 +838,7 @@ class TestRequests:
>-     def test_https_warnings(self, httpbin_secure, httpbin_ca_bundle):
>-         """warnings are emitted with requests.get"""
>-         if HAS_MODERN_SSL or HAS_PYOPENSSL:
>--            warnings_expected = ('SubjectAltNameWarning', )
>-+            warnings_expected = ()
>-         else:
>-             warnings_expected = ('SNIMissingWarning',
>-                                  'InsecurePlatformWarning',
>diff --git a/www/py-requests/pkg-descr b/www/py-requests/pkg-descr
>index 38bd58eb3..9e6f02858 100644
>--- a/www/py-requests/pkg-descr
>+++ b/www/py-requests/pkg-descr
>@@ -19,4 +19,4 @@ Features:
>   * Chunked Requests
>   * .netrc Support
> 
>-WWW: https://docs.python-requests.org/en/master/
>+WWW: https://docs.python-requests.org/en/latest/
>-- 
>2.35.1
>

Actions: View | Diff

Attachments on bug 262399: 232299 | 232329