gentoo auto-resync : 08:12:2024 - 02:07:28

3 files changed, 14 insertions, 123 deletions

diff --git a/dev-python/poetry/Manifest b/dev-python/poetry/Manifest
index 69d6ec4c56a3..7ec2eb8bcf14 100644
--- a/dev-python/poetry/Manifest
+++ b/dev-python/poetry/Manifest
@@ -1,7 +1,5 @@
-DIST poetry-1.8.2.tar.gz 1516966 BLAKE2B 6ca39b426a4117d0c2c3f12b9151d621d629f746e51ca77cda8d7f67ae2493ea9ecb7dd02f69cad3f346579fc3bb16b1117c0dad0a148763bb439c35eac673a5 SHA512 0151c264c2f353753ab7c5a248cdd30e60e33505fd915d841e789a37b18cc06f28b4f987144cd3dbf915e23f6947f6b17cb8fa316b34ce866b6b3559e73b8ddc
-DIST poetry-1.8.3.tar.gz 1518910 BLAKE2B 87c06f9d72c7fbe9f821d8a1de66028d64dfb06a274d67f14d49030c0d9a21f702fc9a5c35fa3a1e75d11c8db01516182f8523e9c466398b305d908e0e02d211 SHA512 72e604e246ec8426a29151caae81bf6b0495d17af519a41a7b934f8d50496dbf77605ea3f2e03bd41fb75a0c97d274987ac0359004544ea6ea19dcc118129e05
 DIST poetry-1.8.4.tar.gz 1519163 BLAKE2B 20b73806ae4559e3a137d80db1abbd52b0ba2edb8b512875dcd784c66fa74ebe8659518af9a87349f5ae821f3962bd325d06c2f52567c6d7bd6fb9e10d2988d4 SHA512 59e4e9737ae8a129544460735aa6d82dd4370bd94b37231b5d336cc4f5b9d48a3b7aeaeea1a5b564339663fd0fa914afc83ddf43aef98aa62387daa959d032c0
-EBUILD poetry-1.8.2.ebuild 3586 BLAKE2B 3727f85d9c15edef6e5bd8944933c1617305c04f372c02b124fdcd37fb00c378a1fd92c9b9cb8505eb37b23879f71070473c3f7df5f677d3eda1e7b95363a30b SHA512 44a8364b925e061688cae276c73ccb6a6bab38ca376111369dce042a4f1a18eb80e365af02b58ede8521bdd5fa8a2773f94a6bc0182c194f36b893cb45505298
-EBUILD poetry-1.8.3.ebuild 3477 BLAKE2B 38fde7c43fb32dd96beab16526f7e09a43438629b4d5b6adf23b42c4a2aa79ed4af8bae8d1d206197d1d5817ddc93c6d2c4e121b2dc4da784e985ad37b2c8749 SHA512 b1c909a13e3b0f800da50ba1ec9401a1a138aa59a807eea23744a522276519e1bd7d8d6b7527122846227c9c2f83cd0a7301529a25c261c727123021a6b80aed
+DIST poetry-1.8.5.tar.gz 1519790 BLAKE2B 378cb327fe6762e8dd09d7f08fb11cd17963c382754a20fba3cc000ac07ab93672b54d967ba6d609d00e9f303461e55ec40eb9549a0b9329f50c4af363fd2343 SHA512 91c2902e5dfb8f3319de53472b1da20b1d8f570a7a3212e6e55883e364295a9e58ce5b7c59450e741f97692e897283d9f624f3d2128db017476d94fd2ea7839c
 EBUILD poetry-1.8.4.ebuild 2393 BLAKE2B af841c11a4a64fb1ec3f9544dd7a38fca6ade9263b68cc73ed11a0843eb717512b847b45cd33c2c583765d370ff8e6b19594ae7944e8134892e4910b1d832cf1 SHA512 c3b94f4826b2863a863ce3a5016df2d49824893c1d12c10e999ed760a2502d2d39d61670c89796f60bdaf3e606d673f38dad0d5541c4d971b98adea15c9299bb
+EBUILD poetry-1.8.5.ebuild 2393 BLAKE2B c7b81def2ebf802fc90bacbbcbebe208e207a13e58d725b7870df3290a88bfc356be5bb1f67b7866edfa7dbd8527e0925779e5481ffe3b65f511a1bbf12a811d SHA512 70e4f1ae015a3c60c9e8140cde7c63dd108e273cb2545cec08e1fd02a226bf44be145c603819b12b8ca5171b7d72bdf5a217406e81c6fe109536abf98f9390f6
 MISC metadata.xml 486 BLAKE2B 7757afe2f964f49a04a600ec80af8511387c3a80105c9050755e1815cac148734f540e4da8c1da401c15a63bf5d0a8200ed6a5e1c09e5dacc7d39f5f59dd343f SHA512 541063e55b4dc5b927ef4ff6b385663bbf978d13ac6644c2537483ec42f211780cab4d881b159894dfe86519b4655c80bcfe17cdb90a2e033077b390a3842f46
diff --git a/dev-python/poetry/poetry-1.8.2.ebuild b/dev-python/poetry/poetry-1.8.2.ebuild
deleted file mode 100644
index df1b773cfca7..000000000000
--- a/dev-python/poetry/poetry-1.8.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A frontend for poetry - a python dependency management and packaging tool"
-HOMEPAGE="
-	https://python-poetry.org/
-	https://github.com/python-poetry/poetry
-	https://pypi.org/project/poetry/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-# dev-python/build: 1.0 breaks backward compatibility
-# https://github.com/python-poetry/poetry/issues/8434
-RDEPEND="
-	>=dev-python/poetry-core-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
-	>=dev-python/cleo-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/crashtest-0.4.1[${PYTHON_USEDEP}]
-	>=dev-python/dulwich-0.21.2[${PYTHON_USEDEP}]
-	>=dev-python/fastjsonschema-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/installer-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/keyring-24.0.0[${PYTHON_USEDEP}]
-	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.9.4[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/shellingham-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
-	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.23.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.10)
-"
-
-BDEPEND="
-	test? (
-			>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
-			>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
-			>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-	)
-"
-
-src_prepare() {
-	# unpin
-	sed -e 's:\^:>=:' \
-		-e '/poetry-core/s:":">=:' \
-		-e 's:,<[0-9.]*::' \
-		-i pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-EPYTEST_DESELECT=(
-	# Tests require network (they run `pip install ...`)
-	tests/installation/test_chef.py::test_isolated_env_install_success
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_directories
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_git
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_git_with_subdirectories
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_non_wheel_files
-	tests/installation/test_installer.py::test_installer_with_pypi_repository
-	tests/installation/test_pip_installer.py::test_uninstall_git_package_nspkg_pth_cleanup
-	tests/masonry/builders/test_editable_builder.py::test_builder_setup_generation_runs_with_pip_editable
-
-	# Works with network, but otherwise: Backend 'poetry.core.masonry.api' is not available.
-	tests/installation/test_chef.py::test_prepare_sdist
-	tests/installation/test_chef.py::test_prepare_directory
-	tests/installation/test_chef.py::test_prepare_directory_with_extensions
-	tests/installation/test_chef.py::test_prepare_directory_editable
-
-	# Internal test for lockfile being up-to-date
-	# Meaningless, also sdist does not include lockfile
-	tests/installation/test_installer.py::test_not_fresh_lock
-
-	# TODO
-	tests/installation/test_executor.py::test_executor_known_hashes
-	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/poetry/poetry-1.8.3.ebuild b/dev-python/poetry/poetry-1.8.5.ebuild
index 30149b85e802..2a5737492d83 100644
--- a/dev-python/poetry/poetry-1.8.3.ebuild
+++ b/dev-python/poetry/poetry-1.8.5.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 RDEPEND="
-	>=dev-python/poetry-core-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/poetry-core-1.9.1[${PYTHON_USEDEP}]
 	>=dev-python/poetry-plugin-export-1.6.0[${PYTHON_USEDEP}]
 	>=dev-python/build-1.0.3[${PYTHON_USEDEP}]
 	>=dev-python/cachecontrol-0.14.0[${PYTHON_USEDEP}]
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-python/keyring-24.0.0[${PYTHON_USEDEP}]
 	>=dev-python/packaging-23.1[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pkginfo-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.12[${PYTHON_USEDEP}]
 	>=dev-python/platformdirs-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/requests-2.26[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-1.0.0[${PYTHON_USEDEP}]
@@ -40,7 +40,7 @@ RDEPEND="
 	>=dev-python/tomlkit-0.11.6[${PYTHON_USEDEP}]
 	>=dev-python/trove-classifiers-2022.5.19[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/virtualenv-20.23.0[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-20.26.0[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
 	' 3.10)
@@ -48,10 +48,9 @@ RDEPEND="
 
 BDEPEND="
 	test? (
-			>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
-			>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
-			>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
+		>=dev-python/deepdiff-6.3.1[${PYTHON_USEDEP}]
+		>=dev-python/httpretty-1.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.9[${PYTHON_USEDEP}]
 	)
 "
 
@@ -66,22 +65,6 @@ src_prepare() {
 }
 
 EPYTEST_DESELECT=(
-	# Tests require network (they run `pip install ...`)
-	tests/installation/test_chef.py::test_isolated_env_install_success
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_directories
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_git
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_git_with_subdirectories
-	tests/installation/test_executor.py::test_executor_should_write_pep610_url_references_for_non_wheel_files
-	tests/installation/test_installer.py::test_installer_with_pypi_repository
-	tests/installation/test_pip_installer.py::test_uninstall_git_package_nspkg_pth_cleanup
-	tests/masonry/builders/test_editable_builder.py::test_builder_setup_generation_runs_with_pip_editable
-
-	# Works with network, but otherwise: Backend 'poetry.core.masonry.api' is not available.
-	tests/installation/test_chef.py::test_prepare_sdist
-	tests/installation/test_chef.py::test_prepare_directory
-	tests/installation/test_chef.py::test_prepare_directory_with_extensions
-	tests/installation/test_chef.py::test_prepare_directory_editable
-
 	# Internal test for lockfile being up-to-date
 	# Meaningless, also sdist does not include lockfile
 	tests/installation/test_installer.py::test_not_fresh_lock
@@ -91,4 +74,10 @@ EPYTEST_DESELECT=(
 	tests/utils/env/test_env_manager.py::test_create_venv_finds_no_python_executable
 )
 
+EPYTEST_XDIST=1
 distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m "not network" -p pytest_mock
+}