diff --git a/build-1.patch b/build-1.patch new file mode 100644 index 0000000..d45763b --- /dev/null +++ b/build-1.patch @@ -0,0 +1,181 @@ +From a16863d1a448ff91a7cc4e48042d3a8669b78b34 Mon Sep 17 00:00:00 2001 +From: David Hotham +Date: Fri, 8 Sep 2023 10:27:09 +0100 +Subject: [PATCH] Support build 1.0 (#8400) + +--- + poetry.lock | 25 ++++++++++++++++++------- + pyproject.toml | 2 +- + src/poetry/inspection/info.py | 9 ++++----- + src/poetry/installation/chef.py | 19 +++++++++++++------ + 4 files changed, 36 insertions(+), 19 deletions(-) + +diff --git a/poetry.lock b/poetry.lock +index 19b9c5d8120..fbb506a7cc0 100644 +--- a/poetry.lock ++++ b/poetry.lock +@@ -20,25 +20,26 @@ tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pyte + + [[package]] + name = "build" +-version = "0.10.0" ++version = "1.0.3" + description = "A simple, correct Python build frontend" + optional = false + python-versions = ">= 3.7" + files = [ +- {file = "build-0.10.0-py3-none-any.whl", hash = "sha256:af266720050a66c893a6096a2f410989eeac74ff9a68ba194b3f6473e8e26171"}, +- {file = "build-0.10.0.tar.gz", hash = "sha256:d5b71264afdb5951d6704482aac78de887c80691c52b88a9ad195983ca2c9269"}, ++ {file = "build-1.0.3-py3-none-any.whl", hash = "sha256:589bf99a67df7c9cf07ec0ac0e5e2ea5d4b37ac63301c4986d1acb126aa83f8f"}, ++ {file = "build-1.0.3.tar.gz", hash = "sha256:538aab1b64f9828977f84bc63ae570b060a8ed1be419e7870b8b4fc5e6ea553b"}, + ] + + [package.dependencies] + colorama = {version = "*", markers = "os_name == \"nt\""} ++importlib-metadata = {version = ">=4.6", markers = "python_version < \"3.10\""} + packaging = ">=19.0" + pyproject_hooks = "*" + tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} + + [package.extras] +-docs = ["furo (>=2021.08.31)", "sphinx (>=4.0,<5.0)", "sphinx-argparse-cli (>=1.5)", "sphinx-autodoc-typehints (>=1.10)"] +-test = ["filelock (>=3)", "pytest (>=6.2.4)", "pytest-cov (>=2.12)", "pytest-mock (>=2)", "pytest-rerunfailures (>=9.1)", "pytest-xdist (>=1.34)", "setuptools (>=42.0.0)", "setuptools (>=56.0.0)", "toml (>=0.10.0)", "wheel (>=0.36.0)"] +-typing = ["importlib-metadata (>=5.1)", "mypy (==0.991)", "tomli", "typing-extensions (>=3.7.4.3)"] ++docs = ["furo (>=2023.08.17)", "sphinx (>=7.0,<8.0)", "sphinx-argparse-cli (>=1.5)", "sphinx-autodoc-typehints (>=1.10)", "sphinx-issues (>=3.0.0)"] ++test = ["filelock (>=3)", "pytest (>=6.2.4)", "pytest-cov (>=2.12)", "pytest-mock (>=2)", "pytest-rerunfailures (>=9.1)", "pytest-xdist (>=1.34)", "setuptools (>=42.0.0)", "setuptools (>=56.0.0)", "setuptools (>=56.0.0)", "setuptools (>=67.8.0)", "wheel (>=0.36.0)"] ++typing = ["importlib-metadata (>=5.1)", "mypy (>=1.5.0,<1.6.0)", "tomli", "typing-extensions (>=3.7.4.3)"] + virtualenv = ["virtualenv (>=20.0.35)"] + + [[package]] +@@ -1231,6 +1232,7 @@ files = [ + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, + {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, ++ {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, + {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, + {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, + {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, +@@ -1238,8 +1240,15 @@ files = [ + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, + {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, ++ {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, + {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, + {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, ++ {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, ++ {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, ++ {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, ++ {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, ++ {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, ++ {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, + {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, + {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, +@@ -1256,6 +1265,7 @@ files = [ + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, + {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, ++ {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, + {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, + {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, + {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, +@@ -1263,6 +1273,7 @@ files = [ + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, + {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, ++ {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, + {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, + {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, + {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, +@@ -1668,4 +1679,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p + [metadata] + lock-version = "2.0" + python-versions = "^3.8" +-content-hash = "368d5dce2e2375400d677b575523352c47f89070355aaf6ade29360ca7bdb5e2" ++content-hash = "12ff5da9d9bc41c06665f74354ba6f2a4383ea54665e9aa873d983a8b105c4cf" +diff --git a/pyproject.toml b/pyproject.toml +index 8f5db44f8a7..73e31be5de7 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -34,7 +34,7 @@ python = "^3.8" + + poetry-core = "1.7.0" + poetry-plugin-export = "^1.5.0" +-build = "^0.10.0" ++build = "^1.0.3" + cachecontrol = { version = "^0.13.0", extras = ["filecache"] } + cleo = "^2.0.0" + crashtest = "^0.4.1" +diff --git a/src/poetry/inspection/info.py b/src/poetry/inspection/info.py +index d1461d4ed76..e45046dceea 100644 +--- a/src/poetry/inspection/info.py ++++ b/src/poetry/inspection/info.py +@@ -46,11 +46,10 @@ + source = '{source}' + dest = '{dest}' + +-with build.env.IsolatedEnvBuilder() as env: ++with build.env.DefaultIsolatedEnv() as env: + builder = build.ProjectBuilder( +- srcdir=source, +- scripts_dir=env.scripts_dir, +- python_executable=env.executable, ++ source_dir=source, ++ python_executable=env.python_executable, + runner=pyproject_hooks.quiet_subprocess_runner, + ) + env.install(builder.build_system_requires) +@@ -58,7 +57,7 @@ + builder.metadata_path(dest) + """ + +-PEP517_META_BUILD_DEPS = ["build==0.10.0", "pyproject_hooks==1.0.0"] ++PEP517_META_BUILD_DEPS = ["build==1.0.3", "pyproject_hooks==1.0.0"] + + + class PackageInfoError(ValueError): +diff --git a/src/poetry/installation/chef.py b/src/poetry/installation/chef.py +index da8679df21f..bcbb77d5ba1 100644 +--- a/src/poetry/installation/chef.py ++++ b/src/poetry/installation/chef.py +@@ -1,5 +1,6 @@ + from __future__ import annotations + ++import os + import tarfile + import tempfile + import zipfile +@@ -43,12 +44,19 @@ def __init__(self, env: Env, pool: RepositoryPool) -> None: + self._pool = pool + + @property +- def executable(self) -> str: ++ def python_executable(self) -> str: + return str(self._env.python) + +- @property +- def scripts_dir(self) -> str: +- return str(self._env._bin_dir) ++ def make_extra_environ(self) -> dict[str, str]: ++ path = os.environ.get("PATH") ++ scripts_dir = str(self._env._bin_dir) ++ return { ++ "PATH": ( ++ os.pathsep.join([scripts_dir, path]) ++ if path is not None ++ else scripts_dir ++ ) ++ } + + def install(self, requirements: Collection[str]) -> None: + from cleo.io.null_io import NullIO +@@ -109,8 +117,7 @@ def _prepare( + env = IsolatedEnv(venv, self._pool) + builder = ProjectBuilder( + directory, +- python_executable=env.executable, +- scripts_dir=env.scripts_dir, ++ python_executable=env.python_executable, + runner=quiet_subprocess_runner, + ) + env.install(builder.build_system_requires) diff --git a/poetry-1.5.1.tar.gz b/poetry-1.5.1.tar.gz deleted file mode 100644 index cd01fa3..0000000 --- a/poetry-1.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d63f86a5849fb65077f80e68521c224312d5a4273250a12ff63fa1dbdf175326 -size 3124121 diff --git a/poetry-1.6.1.tar.gz b/poetry-1.6.1.tar.gz new file mode 100644 index 0000000..c443090 --- /dev/null +++ b/poetry-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5653d6905c378703089fb500f7a85b58bf3b439c61cabb377a11df5495407f9f +size 3123404 diff --git a/python-poetry.changes b/python-poetry.changes index a5ca263..3f0289c 100644 --- a/python-poetry.changes +++ b/python-poetry.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Thu Sep 21 10:10:30 UTC 2023 - Ondřej Súkup + +- add build-1.patch to fix compactibility with python-build-1.0+ +- update to 1.6.1 + * Add support for repositories that do not provide a supported + hash algorithm + * Add full support for duplicate dependencies with overlapping + markers + * Improve performance of poetry lock for certain edge cases + * Improve performance of poetry install + * poetry check validates that specified readme files do exist + * Add a downgrading note when updating to an older version + * Add support for vox in the xonsh shell + * Add support for pre-commit hooks for projects where the + pyproject.toml file is located in a subfolder + * Add support for the git+http:// scheme + * Drop support for Python 3.7 + * Move poetry lock --check to poetry check --lock and + deprecate the former + * Change future warning that PyPI will only be disabled + automatically if there are no primary sources + * Update the minimum required version of requests + * Fix an issue where build-system.requires were not respected + for projects with build scripts + * Fix an issue where the encoding was not handled correctly + when calling a subprocess + * Fix an issue where poetry show --top-level did not show top + level dependencies with extras + * Fix an issue where poetry init handled projects with src + layout incorrectly + * Fix an issue where Poetry wrote .pth files with the wrong + encoding + * Fix an issue where poetry install did not respect the source + if the same version of a package has been locked from + different sources + * Document official Poetry badge + * Add a warning about pip ignoring lock files + * Clarify the use of the virtualenvs.in-project setting. + * Fix command for listing installed plugins + * Mention the nox-poetry package + * Add an example with a PyPI source in the pyproject.toml file + * Use reference instead of deprecated callable in the scripts example + ------------------------------------------------------------------- Mon May 29 17:02:57 UTC 2023 - Ben Greiner diff --git a/python-poetry.spec b/python-poetry.spec index 324ac4f..af31107 100644 --- a/python-poetry.spec +++ b/python-poetry.spec @@ -27,7 +27,7 @@ %{?sle15_python_module_pythons} Name: python-poetry%{psuffix} -Version: 1.5.1 +Version: 1.6.1 Release: 0 Summary: Python dependency management and packaging License: MIT @@ -35,6 +35,7 @@ Group: Development/Languages/Python URL: https://python-poetry.org/ # PyPI sdist doesnt contain tests Source: https://github.com/python-poetry/poetry/archive/%{version}.tar.gz#/poetry-%{version}.tar.gz +Patch0: build-1.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module pip} BuildRequires: %{python_module poetry-core = 1.6.1}