diff options
Diffstat (limited to 'devel/py-poetry/files')
-rw-r--r-- | devel/py-poetry/files/patch-pyproject.toml | 18 | ||||
-rw-r--r-- | devel/py-poetry/files/patch-virtualenv | 25 |
2 files changed, 34 insertions, 9 deletions
diff --git a/devel/py-poetry/files/patch-pyproject.toml b/devel/py-poetry/files/patch-pyproject.toml index 95a2636d41f1..ba954546ba13 100644 --- a/devel/py-poetry/files/patch-pyproject.toml +++ b/devel/py-poetry/files/patch-pyproject.toml @@ -1,11 +1,11 @@ --- pyproject.toml.orig 1970-01-01 00:00:00 UTC +++ pyproject.toml -@@ -14,7 +14,7 @@ dependencies = [ - # which requires some adaptions to our code. - "importlib-metadata (>=4.4,<8.7) ; python_version < '3.10'", - "installer (>=0.7.0,<0.8.0)", -- "keyring (>=25.1.0,<26.0.0)", -+ "keyring (>=23.9.0,<26.0.0)", - # packaging uses calver, so version is unclamped - "packaging (>=24.0)", - "pkginfo (>=1.12,<2.0)", +@@ -29,7 +29,7 @@ dependencies = [ + "trove-classifiers (>=2022.5.19)", + "virtualenv (>=20.26.6,<21.0.0)", + "xattr (>=1.0.0,<2.0.0) ; sys_platform == 'darwin'", +- "findpython (>=0.6.2,<0.7.0)", ++ "findpython (>=0.6.2)", + "pbs-installer[download,install] (>=2025.1.6,<2026.0.0)", + ] + authors = [ diff --git a/devel/py-poetry/files/patch-virtualenv b/devel/py-poetry/files/patch-virtualenv new file mode 100644 index 000000000000..7c944365b029 --- /dev/null +++ b/devel/py-poetry/files/patch-virtualenv @@ -0,0 +1,25 @@ +Obtained from: https://github.com/python-poetry/poetry/commit/9f276d3dab71ba741107a5a7f4efc12fdda5cb0b + +--- pyproject.toml.orig 1970-01-01 00:00:00 UTC ++++ pyproject.toml +@@ -27,8 +27,7 @@ dependencies = [ + "tomlkit (>=0.11.4,<1.0.0)", + # trove-classifiers uses calver, so version is unclamped + "trove-classifiers (>=2022.5.19)", +- # upper pin as quickfix for https://github.com/python-poetry/poetry/issues/10490 +- "virtualenv (>=20.26.6,<20.33.0)", ++ "virtualenv (>=20.26.6)", + "xattr (>=1.0.0,<2.0.0) ; sys_platform == 'darwin'", + "findpython (>=0.6.2,<0.7.0)", + "pbs-installer[download,install] (>=2025.1.6,<2026.0.0)", +--- src/poetry/utils/env/env_manager.py.orig 1970-01-01 00:00:00 UTC ++++ src/poetry/utils/env/env_manager.py +@@ -532,7 +532,7 @@ class EnvManager: + args = [ + "--no-download", + "--no-periodic-update", +- "--try-first-with", ++ "--python", + executable_str or sys.executable, + ] + |