From nobody Sat Nov 19 08:17:33 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 4NDmjT3FN1z4jDlx; Sat, 19 Nov 2022 08:17: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 4NDmjT2r4yz4JJd; Sat, 19 Nov 2022 08:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668845853; 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=F/618eKWerYZA0mkBAwE3ya06njYYsAFVWBqFdnYIzg=; b=ot/1cIrX2JehDGWDJ067nrfpQUtzz7oX9sPs/v5mEumN5xnAHQ7MzW7KIMswrHcUYSwctU G2GNk9VvpXNc/8n5tKPTLtUmiyicSk6rc3w0M6LkJJ1A6CxDVKpiyODtyNHQ4xJyih6JxO 62UE1LMF2Y3+5CO/yglE9yq81Uq9SaVK+I39SWMGzhZA0GGEsS7O6oLkgEUoIIH8Dk7Tcy pKGE8tj4sKrzclw4XqSw3bTJ2EFXoeWZGRnXNUDiu/e17IE4eG44X+Fnp9mWa++kqxIVVU 72DYDCvjd+H2bnPEpMskZkrQhUrp4T82HWljmSORZ5QmtAtb5XS7qsV2wK6yXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668845853; 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=F/618eKWerYZA0mkBAwE3ya06njYYsAFVWBqFdnYIzg=; b=UT3hJcwmROaY5c3bciwxGtad49q8WqLUdm8h1bYJu8h6Tjp0or3++tgXmnzfW/LeWBIhab kJGoVo9EvJzgQbbp6C0+avpn/2jR7aPdld7L/eGStXAT4IkfCOASU9nnL3MxF/sG/njwTi eOczT+vNu4X2IJkB08faStJz7U7zSKt0y2Y+4nBxrai77hAVSdCgqZgsg+gKb7kWyR3t5Y U6CgZVEJ6iQLzED7g6cOMx+SQYD5PN/wNG8WRSE/V/BcFnAu12SAXK2TcaNndJFJkwfcGA FFj3slQk1g6ulRZ2fH03wRNgsQjgJVAb7XJKAcNDUvj8FxXKVj+IGJg40BdzWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668845853; a=rsa-sha256; cv=none; b=B/1LP5e5Lc3Oo6p8GObX3HB3Qwh4KfEXG2JdhaXi1UZOKcj8ciDGs8hp4sJ8UOAky5yhFi a6DNax5J2Uc+ShlBFNT+ZCiFfH4f9vIjNZyYxxvO9ENPaPEVBepmUobo3XTZWSIdH/O2pi PXXqJgE+w3Yjm3futSwJuv21lL/pPmpg/A1jOhFvp1NWsI6F1soRNsdGMeSn9aPir6ZGQ0 rAL5Rf6rrefk6u8WwbqTmn0a6Ooh3whqCJfsvixU8CSwRKbG4slqZBFe7WbQxhPy5TKjqu toGobUYmYr6BfHuKU5D+l8uJC3lVaa+EzuHhCJ9p7OQnrK/h63seCT6UeiXdEg== 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 4NDmjT1wzSzfNh; Sat, 19 Nov 2022 08:17:33 +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 2AJ8HXSR014215; Sat, 19 Nov 2022 08:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AJ8HXhE014214; Sat, 19 Nov 2022 08:17:33 GMT (envelope-from git) Date: Sat, 19 Nov 2022 08:17:33 GMT Message-Id: <202211190817.2AJ8HXhE014214@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: 93cb8d4388b2 - main - devel/py-requirementslib: Update to 2.1.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: 93cb8d4388b285dff313c2a10a1bab7ac058c01c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=93cb8d4388b285dff313c2a10a1bab7ac058c01c commit 93cb8d4388b285dff313c2a10a1bab7ac058c01c Author: Po-Chuan Hsieh AuthorDate: 2022-11-19 08:12:09 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-11-19 08:12:09 +0000 devel/py-requirementslib: Update to 2.1.0 - Allow build with py-vistir 0.7.0+ Changes: https://github.com/sarugaku/requirementslib/releases --- devel/py-requirementslib/Makefile | 4 +-- devel/py-requirementslib/distinfo | 6 ++--- devel/py-requirementslib/files/patch-vistir | 40 +++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/devel/py-requirementslib/Makefile b/devel/py-requirementslib/Makefile index 6a3bea059967..d9975d8cbd06 100644 --- a/devel/py-requirementslib/Makefile +++ b/devel/py-requirementslib/Makefile @@ -1,5 +1,5 @@ PORTNAME= requirementslib -PORTVERSION= 2.0.3 +PORTVERSION= 2.1.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.2:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}plette>=0:devel/py-plette@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomlkit>=0.5.3:textproc/py-tomlkit@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}vistir>=0.6.1<0.6.1_99:devel/py-vistir@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}vistir>=0.6.1:devel/py-vistir@${PY_FLAVOR} USES= python:3.7+ USE_PYTHON= autoplist concurrent distutils diff --git a/devel/py-requirementslib/distinfo b/devel/py-requirementslib/distinfo index 118041c47f8c..0be5fcd37582 100644 --- a/devel/py-requirementslib/distinfo +++ b/devel/py-requirementslib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664767952 -SHA256 (requirementslib-2.0.3.tar.gz) = da978e693eacd70e42bc465ae10b157f5043910f0e58b684e8db08b3f272cece -SIZE (requirementslib-2.0.3.tar.gz) = 117911 +TIMESTAMP = 1665647525 +SHA256 (requirementslib-2.1.0.tar.gz) = b7f9541b3a6b8fbd49e7e58988d9476341b73e3c5e94d48a3ee1bc927e49e5bc +SIZE (requirementslib-2.1.0.tar.gz) = 116773 diff --git a/devel/py-requirementslib/files/patch-vistir b/devel/py-requirementslib/files/patch-vistir new file mode 100644 index 000000000000..0893c1d23732 --- /dev/null +++ b/devel/py-requirementslib/files/patch-vistir @@ -0,0 +1,40 @@ +--- setup.cfg.orig 2022-10-09 02:37:19 UTC ++++ setup.cfg +@@ -50,7 +50,7 @@ install_requires = + requests + setuptools>=40.8 + tomlkit>=0.5.3 +- vistir==0.6.1 ++ vistir>=0.6.1 + + [options.extras_require] + tests = +--- src/requirementslib/models/dependencies.py.orig 2022-10-09 02:36:47 UTC ++++ src/requirementslib/models/dependencies.py +@@ -17,7 +17,6 @@ from pip._internal.utils.temp_dir import TempDirectory + from pip._vendor.packaging.markers import Marker + from pip._vendor.packaging.utils import canonicalize_name + from pip._vendor.packaging.version import parse +-from vistir.compat import fs_str + from vistir.contextmanagers import temp_environ + from vistir.path import create_tracked_tempdir + +@@ -35,6 +34,18 @@ from .utils import ( + name_from_req, + version_from_ireq, + ) ++ ++# from vistir 0.6.1 (src/vistir/compat.py) ++def fs_str(string): ++ """Encodes a string into the proper filesystem encoding. ++ ++ Borrowed from pip-tools ++ """ ++ ++ if isinstance(string, str): ++ return string ++ assert not isinstance(string, bytes) ++ return string.encode(_fs_encoding) + + if MYPY_RUNNING: + from typing import Any, Dict, List, Optional, Set, Text, TypeVar, Union