gentoo auto-resync : 30:08:2024 - 12:00:55

3 files changed, 118 insertions, 1 deletions

diff --git a/dev-python/cattrs/Manifest b/dev-python/cattrs/Manifest
index 1ef9610f121c..c05a5d41d5b1 100644
--- a/dev-python/cattrs/Manifest
+++ b/dev-python/cattrs/Manifest
@@ -1,6 +1,8 @@
 AUX cattrs-23.2.4_pre20240627-py313.patch 2699 BLAKE2B d57e952f73f866cb72d29568e58668de378a9b25042250a0a6c3af4b44674367edf13ff7de9c174100a7ecc308456f2785d6a31ad09dc30621d870356f58c694 SHA512 e234afaa0e73d14a5bc4712afe9838f06e7aafe8f1e9660d2ae4b08d450b9e72de6fe2da808a98b80324cad16124ae998f56e26b13c7bbee9e7cd1d1ae2757a6
 DIST cattrs-23.2.3.gh.tar.gz 612120 BLAKE2B a227cc50cb23a76931562f17444fcfb4a5532cac74f80b478a8abb6d113cbb0a06c471c3ca7ee256f74640486464762f4a13387ccfc1cd144cfd1a9bfecddd8e SHA512 76a75ea0893bb1549dd5178436c4823ae5b918c16f0d8195203c48e894438ec792cee77698d783f7e43c07445c46a6041a309c3d3bbcadcff95d9c4079e3d622
+DIST cattrs-24.1.0.gh.tar.gz 428347 BLAKE2B 21bb94de02b6fce1c456e0d66dbd38defdd1171d4eb815e92ddc9777b12a108e099a5ce0dce4e51c1175cc1771d517ae0d201ac7ff537fbddf2329dce6f88f51 SHA512 879fd9edef39ad325237439915aa2d92c346c9896d463a4c3835335c3b9fb8bc572834a7d7731ccf6b805e59dec481cfdfed50ae8d4899fa31118b6ac6926c1a
 DIST cattrs-6290cacdb7f9d195b4f96ce0ab036c8eebf35d94.gh.tar.gz 426769 BLAKE2B 61851be04434e55d627aac6fd73d72d9d4d8a150bedb6110f4b99068dd58ed29fd23ff083c595eb508b144546d8e4d1e926831dc51985775773ab86a86d98815 SHA512 f1034ae0c57a0618c6568ebac0696928e125121431e965c0ceeda82070a21b448630e3188cc03a8d7a44447126a4a2623b8604ef856a89268e1c0802761d89b9
 EBUILD cattrs-23.2.3-r1.ebuild 1798 BLAKE2B 70e936341c2184d9ac278fa09c8918e9a6f88e74803f20689afff78e00648a4ad07f0a822f862294fce2b7316565a5b3390119b9613385e0fef9693392672976 SHA512 071c341a7cb952d7b4e0d44f056a196c82a236078def096716faba86f74eb70b94cced234aac929b631a4dba471aa64d830236eb1bdb77a8e7806264f02c6c99
-EBUILD cattrs-23.2.4_pre20240627.ebuild 2775 BLAKE2B 6f4b681cbe0f3cc589592ff573f055fe4900282204d3a042bef9fee43433302ca8ba5fd0a4f029f1e302f8353017e051d85b176e7cf39fc6169b2e772b07e422 SHA512 a06f57fb52617d865078746229cc9e7a02337d3e6c35860ebec1585d7c5788a9571e1b3cd5b610cd5ebece3f093a239ba990c1bdd4c2bdb6165a0cf82ef252aa
+EBUILD cattrs-23.2.4_pre20240627.ebuild 3178 BLAKE2B e7b8a136728e246ed7b018ab0dab642bd21a7707420f79a88619855f978cf14518a45e4007b92429bb44577d2dbf8eee2b49bc8f55e60ae39057ce9b0ec13869 SHA512 cf54c418d306d0414d2bd6462a02b22673de23aacf3085469327a9c94c08f3841a53363bbc4a23849913606bd66e9587ebf1f9001f37c51596e360ed63dc50b9
+EBUILD cattrs-24.1.0.ebuild 3073 BLAKE2B 83bf63623c8bb93791bcf6f8deffa7c79d975d431b2b7d91c79a116dab67c0ce22dda69b4d8d5c3c417defc8c55e56039346716727e70e7836d65a96b2b52677 SHA512 f45fb4f2b4563b6e75db738149a2eff067f32630975b84ce4dd76dc035c925def8da4697698cc2da5c712c327aad0161ca57c4686683c905d8d0427cb4ae8ff6
 MISC metadata.xml 347 BLAKE2B 94165f2a8e62f3dc7e195f872944300ffff5ba23b9a7e6c30c18d61bc469ea8ff9b70e516f854bfc52d55a0fd27daff0df58145e34bfe26dbcde8070b8a22630 SHA512 5bb37b39b9574256358a623cff942a95162f5f9dcb32ddf28bd167504c7619be54488fae10044a5c765291f8fa28a5aa346973365dcca867be0eef4e232a4999
diff --git a/dev-python/cattrs/cattrs-23.2.4_pre20240627.ebuild b/dev-python/cattrs/cattrs-23.2.4_pre20240627.ebuild
index 92b15ea9501b..69ded594038b 100644
--- a/dev-python/cattrs/cattrs-23.2.4_pre20240627.ebuild
+++ b/dev-python/cattrs/cattrs-23.2.4_pre20240627.ebuild
@@ -73,6 +73,15 @@ python_test() {
 		tests/test_preconf.py::test_msgspec_json_unstruct_collection_overrides
 		tests/test_preconf.py::test_msgspec_json_unions
 		tests/test_preconf.py::test_msgspec_json_converter
+
+		# tests need updating for attrs-24*
+		# https://github.com/python-attrs/cattrs/issues/575
+		tests/test_baseconverter.py
+		tests/test_converter.py
+		tests/test_gen_dict.py::test_individual_overrides
+		tests/test_gen_dict.py::test_nodefs_generated_unstructuring_cl
+		tests/test_gen_dict.py::test_unmodified_generated_structuring
+		tests/test_structure_attrs.py::test_structure_simple_from_dict_default
 	)
 
 	if ! has_version "dev-python/orjson[${PYTHON_USEDEP}]"; then
diff --git a/dev-python/cattrs/cattrs-24.1.0.ebuild b/dev-python/cattrs/cattrs-24.1.0.ebuild
new file mode 100644
index 000000000000..f517b1a20aca
--- /dev/null
+++ b/dev-python/cattrs/cattrs-24.1.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Composable complex class support for attrs and dataclasses"
+HOMEPAGE="
+	https://pypi.org/project/cattrs/
+	https://github.com/python-attrs/cattrs/
+"
+SRC_URI="
+	https://github.com/python-attrs/cattrs/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+	>=dev-python/attrs-20.1.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/exceptiongroup[${PYTHON_USEDEP}]
+	' 3.10)
+"
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/cbor2-5.4.6[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.54.5[${PYTHON_USEDEP}]
+		>=dev-python/immutables-0.18[${PYTHON_USEDEP}]
+		>=dev-python/msgpack-1.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pymongo-4.2.0[${PYTHON_USEDEP}]
+		>=dev-python/pyyaml-6.0[${PYTHON_USEDEP}]
+		>=dev-python/tomlkit-0.11.4[${PYTHON_USEDEP}]
+		>=dev-python/ujson-5.4.0[${PYTHON_USEDEP}]
+		test-rust? (
+			$(python_gen_cond_dep '
+				>=dev-python/orjson-3.5.2[${PYTHON_USEDEP}]
+			' 'python*')
+		)
+	)
+"
+
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/python-attrs/cattrs/pull/543
+	"${FILESDIR}/${PN}-23.2.4_pre20240627-py313.patch"
+)
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# requires msgspec
+		tests/preconf/test_msgspec_cpython.py
+	)
+	local EPYTEST_DESELECT=(
+		# these require msgspec
+		tests/test_preconf.py::test_msgspec_json_unstruct_collection_overrides
+		tests/test_preconf.py::test_msgspec_json_unions
+		tests/test_preconf.py::test_msgspec_json_converter
+
+		# tests need updating for attrs-24*
+		# https://github.com/python-attrs/cattrs/issues/575
+		tests/test_baseconverter.py
+		tests/test_converter.py
+		tests/test_gen_dict.py::test_individual_overrides
+		tests/test_gen_dict.py::test_nodefs_generated_unstructuring_cl
+		tests/test_gen_dict.py::test_unmodified_generated_structuring
+		tests/test_structure_attrs.py::test_structure_simple_from_dict_default
+	)
+
+	if ! has_version "dev-python/orjson[${PYTHON_USEDEP}]"; then
+		EPYTEST_DESELECT+=(
+			tests/test_preconf.py::test_orjson
+			tests/test_preconf.py::test_orjson_converter
+			tests/test_preconf.py::test_orjson_converter_unstruct_collection_overrides
+		)
+	fi
+
+	case ${EPYTHON} in
+		python3.13)
+			EPYTEST_DESELECT+=(
+				tests/preconf/test_pyyaml.py::test_pyyaml
+				tests/preconf/test_pyyaml.py::test_pyyaml_converter
+				tests/test_converter.py::test_simple_roundtrip
+				tests/test_gen_dict.py::test_unmodified_generated_structuring
+				tests/test_generics.py::test_unstructure_deeply_nested_generics_list
+				tests/test_unstructure_collections.py::test_collection_unstructure_override_mapping
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -o addopts= tests
+}