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,30 +1,30 @@ PORTNAME= requirementslib -PORTVERSION= 2.0.3 +PORTVERSION= 2.1.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= sunpoet@FreeBSD.org COMMENT= Tool for converting between pip-style and pipfile requirements WWW= https://github.com/sarugaku/requirementslib LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}attrs>=19.2:devel/py-attrs@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cached-property>=0:devel/py-cached-property@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}distlib>=0.2.8:devel/py-distlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pep517>=0.5.0:devel/py-pep517@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pip>=22.2:devel/py-pip@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}platformdirs>=0:devel/py-platformdirs@${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 NO_ARCH= yes .include 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