diff --git a/poetry.lock b/poetry.lock index 89d5b1d..0db5693 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,27 +1,28 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "build" -version = "1.1.1" +version = "1.2.1" description = "A simple, correct Python build frontend" optional = false -python-versions = ">= 3.7" +python-versions = ">=3.8" files = [ - {file = "build-1.1.1-py3-none-any.whl", hash = "sha256:8ed0851ee76e6e38adce47e4bee3b51c771d86c64cf578d0c2245567ee200e73"}, - {file = "build-1.1.1.tar.gz", hash = "sha256:8eea65bb45b1aac2e734ba2cc8dad3a6d97d97901a395bd0ed3e7b46953d2a31"}, + {file = "build-1.2.1-py3-none-any.whl", hash = "sha256:75e10f767a433d9a86e50d83f418e83efc18ede923ee5ff7df93b6cb0306c5d4"}, + {file = "build-1.2.1.tar.gz", hash = "sha256:526263f4870c26f26c433545579475377b2b7588b6f1eac76a001e873ae3e19d"}, ] [package.dependencies] colorama = {version = "*", markers = "os_name == \"nt\""} importlib-metadata = {version = ">=4.6", markers = "python_full_version < \"3.10.2\""} -packaging = ">=19.0" +packaging = ">=19.1" pyproject_hooks = "*" tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} [package.extras] 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)"] +test = ["build[uv,virtualenv]", "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 = ["build[uv]", "importlib-metadata (>=5.1)", "mypy (>=1.9.0,<1.10.0)", "tomli", "typing-extensions (>=3.7.4.3)"] +uv = ["uv (>=0.1.18)"] virtualenv = ["virtualenv (>=20.0.35)"] [[package]] @@ -905,51 +906,58 @@ testing = ["pytest", "pytest-benchmark"] [[package]] name = "poetry" -version = "1.8.2" +version = "1.9.0.dev0" description = "Python dependency management and packaging made easy." optional = false -python-versions = ">=3.8,<4.0" -files = [ - {file = "poetry-1.8.2-py3-none-any.whl", hash = "sha256:b42b400d9a803af6e788a30a6f3e9998020b77860e28df20647eb10b6f414910"}, - {file = "poetry-1.8.2.tar.gz", hash = "sha256:49cceb3838104647c3e1021f3a4f13c6053704cc18d33f849a90fe687a29cb73"}, -] +python-versions = "^3.8" +files = [] +develop = false [package.dependencies] -build = ">=1.0.3,<2.0.0" -cachecontrol = {version = ">=0.14.0,<0.15.0", extras = ["filecache"]} -cleo = ">=2.1.0,<3.0.0" -crashtest = ">=0.4.1,<0.5.0" -dulwich = ">=0.21.2,<0.22.0" -fastjsonschema = ">=2.18.0,<3.0.0" +build = "^1.2.1" +cachecontrol = {version = "^0.14.0", extras = ["filecache"]} +cleo = "^2.1.0" +dulwich = "^0.21.2" +fastjsonschema = "^2.18.0" importlib-metadata = {version = ">=4.4", markers = "python_version < \"3.10\""} -installer = ">=0.7.0,<0.8.0" -keyring = ">=24.0.0,<25.0.0" -packaging = ">=23.1" -pexpect = ">=4.7.0,<5.0.0" -pkginfo = ">=1.9.4,<2.0.0" +installer = "^0.7.0" +keyring = "^24.3.1" +packaging = ">=24.0" +pexpect = "^4.7.0" +pkginfo = "^1.10" platformdirs = ">=3.0.0,<5" -poetry-core = "1.9.0" -poetry-plugin-export = ">=1.6.0,<2.0.0" -pyproject-hooks = ">=1.0.0,<2.0.0" -requests = ">=2.26,<3.0" -requests-toolbelt = ">=1.0.0,<2.0.0" -shellingham = ">=1.5,<2.0" -tomli = {version = ">=2.0.1,<3.0.0", markers = "python_version < \"3.11\""} +poetry-core = {git = "https://github.com/radoering/poetry-core.git", branch = "markers/reduce-by-python-constraint"} +poetry-plugin-export = "^1.8.0" +pyproject-hooks = "^1.0.0" +requests = "^2.26" +requests-toolbelt = "^1.0.0" +shellingham = "^1.5" +tomli = {version = "^2.0.1", markers = "python_version < \"3.11\""} tomlkit = ">=0.11.4,<1.0.0" trove-classifiers = ">=2022.5.19" -virtualenv = ">=20.23.0,<21.0.0" -xattr = {version = ">=1.0.0,<2.0.0", markers = "sys_platform == \"darwin\""} +virtualenv = "^20.23.0" +xattr = {version = "^1.0.0", markers = "sys_platform == \"darwin\""} + +[package.source] +type = "git" +url = "https://github.com/radoering/poetry.git" +reference = "lock-markers-and-groups3a" +resolved_reference = "49f69c9dcc7d6eaed2bd7bc14049ef72c7c28d5d" [[package]] name = "poetry-core" version = "1.9.0" description = "Poetry PEP 517 Build Backend" optional = false -python-versions = ">=3.8,<4.0" -files = [ - {file = "poetry_core-1.9.0-py3-none-any.whl", hash = "sha256:4e0c9c6ad8cf89956f03b308736d84ea6ddb44089d16f2adc94050108ec1f5a1"}, - {file = "poetry_core-1.9.0.tar.gz", hash = "sha256:fa7a4001eae8aa572ee84f35feb510b321bd652e5cf9293249d62853e1f935a2"}, -] +python-versions = "^3.8" +files = [] +develop = false + +[package.source] +type = "git" +url = "https://github.com/radoering/poetry-core.git" +reference = "markers/reduce-by-python-constraint" +resolved_reference = "e75e42de7e0b22ba7b398d1670fa1d04777ea147" [[package]] name = "pre-commit" @@ -1562,4 +1570,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "a307339f49db1e3c72043055981f0e715ae1892e9592fc74e3f11b64c3709303" +content-hash = "f24659d2f25b83f8dd1d09ad7a222941fc081dc3c5a0b0a62a38ab8a0dfffaf7" diff --git a/pyproject.toml b/pyproject.toml index d3d7b57..dec9a59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -18,7 +18,7 @@ include = [ [tool.poetry.dependencies] python = "^3.8" -poetry = ">=1.8.0,<3.0.0" +poetry = { git = "https://github.com/radoering/poetry.git", branch = "lock-markers-and-groups3a" } poetry-core = ">=1.7.0,<3.0.0" [tool.poetry.group.dev.dependencies] diff --git a/tests/conftest.py b/tests/conftest.py index e8afd62..a25c08d 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -175,11 +175,14 @@ def _factory( # with https://github.com/python-poetry/poetry/pull/9133 locker = TestLocker( poetry.locker.lock, - poetry.locker._pyproject_data, # type: ignore[attr-defined] + poetry.locker._pyproject_data, ) except AttributeError: # before https://github.com/python-poetry/poetry/pull/9133 - locker = TestLocker(poetry.locker.lock, poetry.locker._local_config) + locker = TestLocker( + poetry.locker.lock, + poetry.locker._local_config, # type: ignore[attr-defined] + ) locker.write() poetry.set_locker(locker)