From nobody Sun Oct 9 15:41:20 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 4MlmVT0sLLz4dwlw; Sun, 9 Oct 2022 15:41:21 +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 4MlmVS6JGYz3mgm; Sun, 9 Oct 2022 15:41:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665330081; 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=mm0Ww7gQtHlOv8eGXEO05Ung9aX8mS2Q9t4zEcyPgUY=; b=fqHK9ICgW3H8v3huuQwlrUATAk8a57sTf7rwprheoe/kk3GZRue8b3X74C0/Irdd2HNh3H uub7t23GZYvCLhmOdSKUPxhovbssxA+Toso/q7NQzFPL8GolG8lyaXZ1/Qs6k27RgmykT0 f7PE8OWw2B3z8WM5k0Ulhb5JxWdgWSbOSgk/KTGsnj/nxHd27tlCG8XsioBY1Xb2qOaggw 56Ruxo9jaCuxT2b2dUBwQzenRvmSb8bP9q0OCF+C/4xTHIBBPCpByVJm9rLfxF1SNTyFxm IjXMl2VtADF3JVRYJb1ku36L5qpM1iw+FVBFxcaLGG1vecpsoLQ3cCJIumVOpw== 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 4MlmVS4sv0zKXD; Sun, 9 Oct 2022 15:41:20 +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 299FfKOK054554; Sun, 9 Oct 2022 15:41:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 299FfKCf054553; Sun, 9 Oct 2022 15:41:20 GMT (envelope-from git) Date: Sun, 9 Oct 2022 15:41:20 GMT Message-Id: <202210091541.299FfKCf054553@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: f4b4d7fb2815 - main - www/py-requests-cache93: Allow build with py-cattrs 22.2.0 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: f4b4d7fb281556784b495dc8e8eee9dfb6862e11 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665330081; 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=mm0Ww7gQtHlOv8eGXEO05Ung9aX8mS2Q9t4zEcyPgUY=; b=ZqJT35zVOBaV2JIJQoXOC9dLkxTSE4vl9WgjWjNsnvjWJROdDqoAKGX80T9ivrHjGCLSRP M6MBedQupAwZZb8q6XgAvPFjwjOmUdDXl7sobRlTOx0NPUkB5a0uyAezOdjjv9YXXCFC4o SB1bFKRWoTqWB6bjCiQ7BWMPq8F4qeDcQjFxh6SYSSttiKAfjcfhp+uKL7u0MHMr7+ATMp 30bll2mWnz3ovopeDxvTpFcsKOqNM+UFYVqmOoc09G4439gFK+BqJSEgzuMcoEx3d2WamX afPD8G1eVIcUFGIB80Y0hcLudceUrBSAgjaZlCdih/YuH+7M5QS73FIN+//3UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665330081; a=rsa-sha256; cv=none; b=eAPjZbZoWYyj31t2KaU/PGDpHLbiOXQNIfI/DgqWuDIQyLLeY88IO4kqFzjTjLjhLPK730 OctBYleMd/vXJMwJX3mDx5Nj0bKA5iVHoPzSHVQcypm0xMDU025Xh7J2YFUb/4y5nVZ71J +Ao7leEV63+KJmEVV4XGNPzlWtlz/Wq2MwWwj5e8YxIY8FGPjgosJkWhfgzxFbN92yBSL1 VcoPcpCTZ0Gd08IJfRBL0+sj2bouJZqh6yK/OneCb6AfzM2iulX8zdzlygwpP1qfuLH6+Q 8oOJwsQtCTW6+l7Vucqv8IllIaV4iLnvEXJoV7+rYl6qgjNYIWX6QPPtledyZA== 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=f4b4d7fb281556784b495dc8e8eee9dfb6862e11 commit f4b4d7fb281556784b495dc8e8eee9dfb6862e11 Author: Po-Chuan Hsieh AuthorDate: 2022-10-09 15:33:52 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-10-09 15:38:12 +0000 www/py-requests-cache93: Allow build with py-cattrs 22.2.0 - Bump PORTREVISION for package change --- www/py-requests-cache93/Makefile | 5 +--- www/py-requests-cache93/files/patch-cattrs | 36 ++++++++++++++++++++++++++-- www/py-requests-cache93/files/patch-setup.py | 2 +- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/www/py-requests-cache93/Makefile b/www/py-requests-cache93/Makefile index 80bf23c64177..ece988d97b9f 100644 --- a/www/py-requests-cache93/Makefile +++ b/www/py-requests-cache93/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}appdirs>=1.4.4<2.0.0:devel/py-appdirs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}attrs>=21.2:devel/py-attrs@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cattrs>=1.8<22.2:devel/py-cattrs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}cattrs>=1.8<22.3:devel/py-cattrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.22<3.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}url-normalize>=1.4<2.0:net/py-url-normalize@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.25.5,1<2.0.0,1:net/py-urllib3@${PY_FLAVOR} @@ -27,7 +27,4 @@ NO_ARCH= yes PORTSCOUT= ignore:1 -do-test: - cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -rs -v - .include diff --git a/www/py-requests-cache93/files/patch-cattrs b/www/py-requests-cache93/files/patch-cattrs index c94d37779c38..6318c6e8082e 100644 --- a/www/py-requests-cache93/files/patch-cattrs +++ b/www/py-requests-cache93/files/patch-cattrs @@ -1,3 +1,35 @@ +--- requests_cache/serializers/cattrs.py.orig 2022-02-23 03:10:56 UTC ++++ requests_cache/serializers/cattrs.py +@@ -14,7 +14,7 @@ serialization format. + from datetime import datetime, timedelta + from typing import Callable, Dict, ForwardRef, MutableMapping + +-from cattr import GenConverter ++from cattr import Converter + from requests.cookies import RequestsCookieJar, cookiejar_from_dict + from requests.structures import CaseInsensitiveDict + from urllib3._collections import HTTPHeaderDict +@@ -28,7 +28,7 @@ class CattrStage(Stage): + on its own, or as a stage within a :py:class:`.SerializerPipeline`. + """ + +- def __init__(self, factory: Callable[..., GenConverter] = None): ++ def __init__(self, factory: Callable[..., Converter] = None): + self.converter = init_converter(factory) + + def dumps(self, value: CachedResponse) -> Dict: +@@ -42,9 +42,9 @@ class CattrStage(Stage): + return self.converter.structure(value, cl=CachedResponse) + + +-def init_converter(factory: Callable[..., GenConverter] = None): ++def init_converter(factory: Callable[..., Converter] = None): + """Make a converter to structure and unstructure nested objects within a :py:class:`.CachedResponse`""" +- factory = factory or GenConverter ++ factory = factory or Converter + converter = factory(omit_if_default=True) + + # Convert datetimes to and from iso-formatted strings Obtained from: https://github.com/requests-cache/requests-cache/commit/66550b5355f4a4f063b4b22c3139a2f941c91eb4 --- requests_cache/serializers/preconf.py.orig 2022-02-23 03:10:56 UTC @@ -26,7 +58,7 @@ Obtained from: https://github.com/requests-cache/requests-cache/commit/66550b535 -from cattr.preconf import bson as bson_preconf -from cattr.preconf import json as json_preconf -from cattr.preconf import msgpack, orjson, pyyaml, tomlkit, ujson -+from cattr import GenConverter ++from cattr import Converter from .._utils import get_placeholder_class from .cattrs import CattrStage @@ -180,7 +212,7 @@ Obtained from: https://github.com/requests-cache/requests-cache/commit/66550b535 ['appdirs>=1.4.4,<2.0.0', 'attrs>=21.2,<22.0', - 'cattrs>=1.8,<2.0', -+ 'cattrs>=1.8,<22.2', ++ 'cattrs>=1.8,<22.3', 'requests>=2.22,<3.0', 'url-normalize>=1.4,<2.0', 'urllib3>=1.25.5,<2.0.0'] diff --git a/www/py-requests-cache93/files/patch-setup.py b/www/py-requests-cache93/files/patch-setup.py index 6cadfb7e8e49..1bb030ad70ea 100644 --- a/www/py-requests-cache93/files/patch-setup.py +++ b/www/py-requests-cache93/files/patch-setup.py @@ -6,6 +6,6 @@ ['appdirs>=1.4.4,<2.0.0', - 'attrs>=21.2,<22.0', + 'attrs>=21.2', - 'cattrs>=1.8,<22.2', + 'cattrs>=1.8,<22.3', 'requests>=2.22,<3.0', 'url-normalize>=1.4,<2.0',