From ac4d0ec6279a51ce08af9e3293666bc339be6b6f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Mar 2024 13:13:18 +0000 Subject: gentoo auto-resync : 28:03:2024 - 13:13:17 --- dev-python/Manifest.gz | Bin 271770 -> 271768 bytes dev-python/build/Manifest | 2 +- dev-python/build/build-1.2.0.ebuild | 1 + dev-python/pybind11/Manifest | 2 - dev-python/pybind11/pybind11-2.12.0.ebuild | 68 --------------------- dev-python/requests-mock/Manifest | 3 +- .../files/requests-mock-1.12.0-no-pbr.patch | 22 +++++++ .../requests-mock/requests-mock-1.12.0.ebuild | 5 ++ dev-python/tavern/Manifest | 3 +- .../tavern/files/tavern-2.10.1-pytest-8.patch | 36 +++++++++++ dev-python/tavern/tavern-2.10.1.ebuild | 5 ++ 11 files changed, 74 insertions(+), 73 deletions(-) delete mode 100644 dev-python/pybind11/pybind11-2.12.0.ebuild create mode 100644 dev-python/requests-mock/files/requests-mock-1.12.0-no-pbr.patch create mode 100644 dev-python/tavern/files/tavern-2.10.1-pytest-8.patch (limited to 'dev-python') diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz index 7ce7692718eb..97d8d706e217 100644 Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ diff --git a/dev-python/build/Manifest b/dev-python/build/Manifest index c86b43c8e453..864a895598c2 100644 --- a/dev-python/build/Manifest +++ b/dev-python/build/Manifest @@ -1,5 +1,5 @@ DIST build-1.1.1.gh.tar.gz 44605 BLAKE2B aa1d554d55007e8cb715981938bb8765230ae5ddc6c5bc29efeb52c0e18b6337a13c27f3389772a83cc0ecc9b7d3e889fbc305e91f1290424d7031a1782f683f SHA512 5fa64b07f2c22faca074d1447f5fcb12b7ad40e5fe897f034901d7932d8a9aa2c1dfa806d373503246255d7d9a2429b336384a980376f4ae7c810ae275b735da DIST build-1.2.0.gh.tar.gz 47350 BLAKE2B 874f4871d5b8c22ce1d93a840fd00315cfa3a93b01a44e3c8c3270d2dcb66455e2c44e757d0ae15a58a35ea4ee8679a797191523254c914150d801cf3c0a5fa8 SHA512 aaa4677f8eb04c2872dc0f64287e00cd0aa47b10d3bfd67a63c22db42caef8baae9996c3a6ced3a07cce4a54d6fd52a3f15d167f804f7f518d258aa5da68419c EBUILD build-1.1.1.ebuild 1684 BLAKE2B 0dfc43a98f0edb7693d533cd3b75570191e716e87ce00e1255f2d1a3d40fa06bc028f1895535e8eac7f38b0d3c95da057ae9e93cef1eb763043a471441bea5e7 SHA512 b65bacfcde9bc791b724a9e3d461a1398b206117bea5f3aabbfc5ea96c174ba56979903adde1d10734939685b45c2bf91b832036c21e7220186c38173fded8c1 -EBUILD build-1.2.0.ebuild 2058 BLAKE2B ff9febec6bd88ca8d41ac7f9b2fe42ffab84552a2134bfe63bbeaba763cad5df95920480a9b18b1e47715f46ed101fe8c2044dfe5faf6ae351b31ad88f9f7f39 SHA512 67cf0c94b2e9a6b57ce4bc2618a63bedf08b57f20e21d85e66b727c3999e1d2d5c67eb88fadc1ae8d31095bd761dda81e33f7e6a0c721d7d038086bb7a770282 +EBUILD build-1.2.0.ebuild 2110 BLAKE2B dcbe024a327c13a417feef4140e4c83525101d43a3e806e347490fb3acfa7edf0a77ff4470a235a999f624189d8bb636e390303c9728962cb534c87f8ace78a9 SHA512 71f2ccf8bcc7df2117ef0e66b3f6ce1993f3951b4cbef8f00c2fb861f8229db45b90512c532af20f08e45c9f60f1fcda1a2d65eb7147883c3555c4a5c55e86eb MISC metadata.xml 361 BLAKE2B 1c46e1d83bec4a8aaedd932af700865009735ff75e3af63ef7c08f7c00883d5f658f86aec981cd48c8ef0ab0a287250a3a4fdfad42fb434f6c06d9f33f72f7d6 SHA512 89c86db40833c86e25f387c5bfa8952b62e983714be85af1e8ca2a6ef8a402b94cc32dfc18cda8d8850736aaabdb46c153743af9bcb027e86b2c1f085f6f2369 diff --git a/dev-python/build/build-1.2.0.ebuild b/dev-python/build/build-1.2.0.ebuild index ed554e9b68e0..9831bacb2851 100644 --- a/dev-python/build/build-1.2.0.ebuild +++ b/dev-python/build/build-1.2.0.ebuild @@ -36,6 +36,7 @@ BDEPEND=" >=dev-python/pytest-rerunfailures-9.1[${PYTHON_USEDEP}] >=dev-python/pytest-xdist-1.34[${PYTHON_USEDEP}] >=dev-python/setuptools-56.0.0[${PYTHON_USEDEP}] + >=dev-python/virtualenv-20.0.35[${PYTHON_USEDEP}] >=dev-python/wheel-0.36.0[${PYTHON_USEDEP}] test-rust? ( dev-python/uv diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest index c0b418a3cbc3..0775169f5a41 100644 --- a/dev-python/pybind11/Manifest +++ b/dev-python/pybind11/Manifest @@ -1,5 +1,3 @@ DIST pybind11-2.11.1.gh.tar.gz 756445 BLAKE2B 66ad933ffcd7fd475121f0b7488e13b914cb090d0ed511b96070e2849dcc537fb55e865b72fe06da6c5d1e3ed8e438799c5b0b60cbdc71e5713530174bff3be9 SHA512 ed1512ff0bca3bc0a45edc2eb8c77f8286ab9389f6ff1d5cb309be24bc608abbe0df6a7f5cb18c8f80a3bfa509058547c13551c3cd6a759af708fd0cdcdd9e95 -DIST pybind11-2.12.0.gh.tar.gz 771004 BLAKE2B df95d12cd005c85434ba8a4d80740f437f3f9433b0fbc9e6e1e5bf840281d5cb8295500b6510474a91b45201323b19079743ca927f7d1be2c1dc0dca89833e9c SHA512 c20247a4dccec310307174a26a79f9a98dd7ae7c84a48ad61c61589b02ef74caac26c2945de602cbe38b0bea65fc9985f1cc37f9e2322cae2f824dee98d602f1 EBUILD pybind11-2.11.1.ebuild 1305 BLAKE2B 60bdb063e9efb295ac3d49497b199cd9b9dedd23e3891ec9c96c6e2867e89c1cee9c16f3a34a4772813a850c74484fefd9c2dd53a072a84025b894546a0b237c SHA512 524695d724d859ea333de8975c392792c4ed685212204ecf72020af767d1cff6fdc307ecbd8e433af3627a76b2c7a5a41e83b13e313041fdd474df73880fb19c -EBUILD pybind11-2.12.0.ebuild 1313 BLAKE2B c899f766ebeb7aee443f4908451fa47e75687aee2a7a13d3b361b61b93f2fd323ac707353f10575acc59bc937b3fd3fc462341f8c57f3e8ad304ddeefaad33a4 SHA512 b134ea98d2aee79bc20a31c34a420479c5925a6f3fae3ae7bb07c79eb61d2deca1a9b5a282c6cbd3abdc4df19b3bb1de63766dab7a4c2e7227143cf53a751570 MISC metadata.xml 475 BLAKE2B faf317a1197850acb0d16546a303bd50ee1bfe6fc3aaf592e6c147c6612fd20b809f1c911d79ca9a356cfa0c4166d2b155fcbd593f8b55e0d7dd75ff6444073b SHA512 5779adcc9f25c15fd999aa6c91d3144fc14535270e57925bfb8ac67f45448c144a142af2ea9a321ec6ffbf568713f663cef85a0be3d4a056e58b1782a5fc9a41 diff --git a/dev-python/pybind11/pybind11-2.12.0.ebuild b/dev-python/pybind11/pybind11-2.12.0.ebuild deleted file mode 100644 index c27195fb2ada..000000000000 --- a/dev-python/pybind11/pybind11-2.12.0.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit cmake distutils-r1 - -DESCRIPTION="AST-based Python refactoring library" -HOMEPAGE=" - https://pybind11.readthedocs.io/en/stable/ - https://github.com/pybind/pybind11/ - https://pypi.org/project/pybind11/ -" -SRC_URI=" - https://github.com/pybind/pybind11/archive/v${PV}.tar.gz - -> ${P}.gh.tar.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos" - -RDEPEND=" - dev-cpp/eigen:3 -" -BDEPEND=" - test? ( - >=dev-cpp/catch-2.13.5 - dev-libs/boost - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - export PYBIND11_USE_CMAKE=1 - cmake_src_prepare - distutils-r1_python_prepare_all -} - -python_configure() { - local mycmakeargs=( - # disable forced lto - -DPYBIND11_LTO_CXX_FLAGS= - -DPYBIND11_INSTALL=ON - -DPYBIND11_TEST=$(usex test) - ) - cmake_src_configure -} - -python_compile() { - distutils-r1_python_compile - # Compilation only does anything for tests - use test && cmake_src_compile -} - -python_test() { - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - cmake_build check -} - -python_install() { - distutils-r1_python_install - cmake_src_install -} diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest index 698c6ac987be..0c32941260fd 100644 --- a/dev-python/requests-mock/Manifest +++ b/dev-python/requests-mock/Manifest @@ -1,5 +1,6 @@ +AUX requests-mock-1.12.0-no-pbr.patch 909 BLAKE2B dd03b0d0d5c4bcd1489045d1e4e88c44d85cdc20be3eac260ea16b765fc8ebc81d0031f23cb5c38889b00cbb42fadc0abd41ef7bee04806f64fce85f6fa2026f SHA512 9edfb0d639241340661d9e02649755c5b2c9ed551303d9ef0609ee32d999f73d17cdf9da632112b064f470c91539a58e6e71553a3ee53b93c0dac04425930688 DIST requests-mock-1.11.0.tar.gz 74377 BLAKE2B f871bbd18b42668d9eb693b807a67a33c9fb7c4316966ad2c16800bf562be982c737e1c1a803e3c5b6d3cde8c3d789671b5fce7d54df308dc55b2ef73a641ff4 SHA512 8d161cb0f6183994053d4dd06b801c2614b7ac937798addcdc52ee8e3973a7ef874ca615ca1946ea4bc0e05ce36c5c813460f7a41b3254671095059536fd2961 DIST requests-mock-1.12.0.tar.gz 60874 BLAKE2B 53e0cf6cf25dbfec87e913a9f85c9ad0757e3b071e4c1d66a31810283cd0332a0a8b8317a9da433a2b36f629ff52808a82993126a5f7a9d138c47099072329a3 SHA512 1bc07b5fa90752d73e05de7147f891600fce3041f6b9aaf3ad6be87532b314543340d94087e834801761a7f3aefb0bb1e1bdb717c11b90b940cccf37b2982164 EBUILD requests-mock-1.11.0.ebuild 1353 BLAKE2B ae0f3115c638eddf9104bc9110b0e050429d9faa74cf636b8a76c49f513b56a26820d2180bc665cc645708465e0251df3912453576815138fc0642688081914d SHA512 2a43327d61b514e895bb55d195ab5856c91dc2274bd0b965019fb46f099a58996467e03311d64b5602c4fd0f9ffe912a1a60539b4b476c645f7f12549c76c73b -EBUILD requests-mock-1.12.0.ebuild 1330 BLAKE2B 9268d8a153acba566054a80674749cac101b8c6a17ef975b3e1c33c11f9dbce9df46ac055f6d27420a4f4b3b3c81e5645120e579da6f426e26631fd0fe5ba15f SHA512 0840b5065db401082a127ed9ec8b5e7c00252268295e81e5367b789ca3dc8bbf10eec2d1c4cef6d87f409db3ddddd176c7a70ec6282605dec6cf494bfbb8645d +EBUILD requests-mock-1.12.0.ebuild 1443 BLAKE2B 3c4703a4b62c59f84a3d06dc8f0171b57d4dc3e5df260346345cc250704843975c32c5c398f452a6f5d1b29cce5250e78ff6a7227e20164555af870f8170f79c SHA512 6c3f4073c85ac5de5ae00864ede17080f7a91033ed280b757f3ad16eb80a94645add6e8fe9e3037ea6de1f1269c80a6cc9057b8d9f6d5b33311cfc368adb61ef MISC metadata.xml 479 BLAKE2B ddd64d016f85e6960f2d8a10d53591c6ffa5c0f61ebc4074f5867a03c0d8f533468351b87cb10e662391aa3d8fdd61b07bcf607c1d5b07a13fe85cf600def424 SHA512 341437e0fb7b532b7845d000e0647ed9858efe1336e8b6f57f55f677483eae4985ac0f54016da09d22d007895f3450a5e1fa6cf5d20fa715f74466a4cdf43cfa diff --git a/dev-python/requests-mock/files/requests-mock-1.12.0-no-pbr.patch b/dev-python/requests-mock/files/requests-mock-1.12.0-no-pbr.patch new file mode 100644 index 000000000000..fcfc8f9d2eb4 --- /dev/null +++ b/dev-python/requests-mock/files/requests-mock-1.12.0-no-pbr.patch @@ -0,0 +1,22 @@ +From 82a6d09fa8db7a0667b365e9c06e99f8c0dfd245 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 28 Mar 2024 12:54:18 +0100 +Subject: [PATCH] Replace the last use of pbr with modern packaging + +diff --git a/doc/source/conf.py b/doc/source/conf.py +index 395acaa..e0895f5 100755 +--- a/doc/source/conf.py ++++ b/doc/source/conf.py +@@ -16 +16,2 @@ import sys, os +-import pbr.version ++import importlib.metadata ++import packaging +@@ -56 +57 @@ copyright = u'2023, Jamie Lennox' +-version_info = pbr.version.VersionInfo(project) ++version_info = packaging.version.parse(importlib.metadata.version(project)) +@@ -59 +60 @@ version_info = pbr.version.VersionInfo(project) +-version = version_info.version_string() ++version = version_info.base_version +@@ -61 +62 @@ version = version_info.version_string() +-release = version_info.release_string() ++release = version_info.public diff --git a/dev-python/requests-mock/requests-mock-1.12.0.ebuild b/dev-python/requests-mock/requests-mock-1.12.0.ebuild index a0e17f881c2f..ff7866ac1da6 100644 --- a/dev-python/requests-mock/requests-mock-1.12.0.ebuild +++ b/dev-python/requests-mock/requests-mock-1.12.0.ebuild @@ -36,6 +36,11 @@ distutils_enable_sphinx doc/source distutils_enable_tests pytest python_prepare_all() { + local PATCHES=( + # https://github.com/jamielennox/requests-mock/pull/255 + "${FILESDIR}/${P}-no-pbr.patch" + ) + # Disable reno which only works inside a git repository sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die # Remove the release notes section which requires reno diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest index b02ff6197be5..e79dd6dc3c00 100644 --- a/dev-python/tavern/Manifest +++ b/dev-python/tavern/Manifest @@ -1,5 +1,6 @@ +AUX tavern-2.10.1-pytest-8.patch 1218 BLAKE2B 0f4e488667320fde42f487fe565a5665fad663e80c06c9065cf5377182e3ff7437b1e8e9d31e0d91bdec270958998d601d286ed5cf36bf6826ff55b0301d2b57 SHA512 9a6a4d1b00e69d31cb81767b3ac42fe0ca508b8e134a67497d7a09e700ad95fd5d6b053c39ae0184b148e735655a26272aae33ceab2f228474b62d76175158cb DIST tavern-2.10.1.gh.tar.gz 239917 BLAKE2B 836f4940ba7b9a17455e757a7bdec578effc6753162d0ff0b05c46d293cad840924f3e8d66aac08553478d63eb0edb61ad39f53e4e36d9a7681bae303e71a614 SHA512 a09e55e2fa71d2601833137e51fc94cb8bd65086fc21e6c26055406a6be3dce44b57f89d91d7a766aa88c0b5b4214f28eeda69812f1f623ed60f45f57dcf2ded DIST tavern-2.9.3.gh.tar.gz 248368 BLAKE2B feccd1c8e50db6def318553186f0dbfc9643c3942e060bb1950305c4e93fac15550b06d7ba5c2c6008175ef5a701f211408da3607ffcf3429d5542c97029cc7b SHA512 525a0b3f2c63fe4a9991ace7e27287898cbcd423e915e9ff4585eb85e0e42f06e499f653b2615b3f98998206b48c6c8f42468fae174ca4d7e7a38bf171b6feda -EBUILD tavern-2.10.1.ebuild 1523 BLAKE2B 80bf33e5aca508d51c0fa7cd8288bdc85d1766bbad42752b9b80e34faccb87e4f683940114ca34704dd854809d56f25c988c9ff68b5f127fcc736f3266002668 SHA512 cd9a018d27fbd42f3ece8a63d8f7d97deacda88d5c938406397b23d15708b88a9332cc2aff5b2ab26b3646ebeb91c2771ab904115aac82ffc00f301b6cb5f381 +EBUILD tavern-2.10.1.ebuild 1633 BLAKE2B 610e8b5c4462a83e929e700d5d05743c7b76de3f8f2d1bd5643dea2432f82668bb21ea28b3654332e640a1363e2f73d12a964fe1af316cf46eb7c3db772bcbad SHA512 b9b10bf54ec06003f7b4998b1621cea35b928ee06642ea00131c7ced00eb88c6926ea53423f6fd29279452f13c86b4306699b4eb611a6cbb2c02ee5ad65ab7b7 EBUILD tavern-2.9.3.ebuild 1522 BLAKE2B 35435e33ab4b99389e05bb9676810021d553d8cd5743bfd6971ed944e4217c36aebcb701a706370fa296b2e3f06a506cd8e1101a25d48072c25711f81308785d SHA512 805f21a2fd46a59d2730f5267c35f26a0eb7108054946754b864607364da8743b85da339b1d0ccc8cd3cd54b4c5514a1387b9dfae4c089752f3edc45d7fbd3bd MISC metadata.xml 567 BLAKE2B ea43aa37a078962133a772cb2d283a20b521d17dc7d501fd2d7bad8228e47049e0a9924542b7434d9624d28a9bbc5e43df872462740187d0f4e22f94a5d56469 SHA512 10de2ac011f427eee5eaa897e23198495bd1fa093addf2015830383344f375c9faf660bb7e9e4385995e7ded02f7d954d5d34ca67c88dd00ae517415b8470c92 diff --git a/dev-python/tavern/files/tavern-2.10.1-pytest-8.patch b/dev-python/tavern/files/tavern-2.10.1-pytest-8.patch new file mode 100644 index 000000000000..6820164b50e1 --- /dev/null +++ b/dev-python/tavern/files/tavern-2.10.1-pytest-8.patch @@ -0,0 +1,36 @@ +From 3aa8cc92e474e91c2a4014b4b4ec2f1e4b2e620a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= +Date: Thu, 28 Mar 2024 13:20:00 +0100 +Subject: [PATCH] Replace deprecated `pytest.warns(None)` + +Replace the deprecated `pytest.warns(None)` use with the `error` warning +filter, as recommended +in https://github.com/pytest-dev/pytest/issues/9404#issue-1076710891. +With this change, the tests pass with pytest-8.1.1. +--- + tests/unit/test_call_run.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/unit/test_call_run.py b/tests/unit/test_call_run.py +index 30972c1a..88a72714 100644 +--- a/tests/unit/test_call_run.py ++++ b/tests/unit/test_call_run.py +@@ -1,3 +1,4 @@ ++import warnings + from unittest.mock import patch + + import pytest +@@ -35,11 +36,10 @@ def test_run_with_cfg(self): + ) + def test_doesnt_warn_about_expected_kwargs(self, expected_kwarg): + kw = {expected_kwarg: 123} +- with pytest.warns(None) as warn_rec: ++ with warnings.catch_warnings(): ++ warnings.simplefilter("error") + run("", **kw) + +- assert not len(warn_rec) +- + + class TestParseGlobalCfg: + def test_path_correct(self): diff --git a/dev-python/tavern/tavern-2.10.1.ebuild b/dev-python/tavern/tavern-2.10.1.ebuild index 74fcee9d1337..ee97b4e46bab 100644 --- a/dev-python/tavern/tavern-2.10.1.ebuild +++ b/dev-python/tavern/tavern-2.10.1.ebuild @@ -44,6 +44,11 @@ BDEPEND=" distutils_enable_tests pytest src_prepare() { + local PATCHES=( + # https://github.com/taverntesting/tavern/pull/922 + "${FILESDIR}/${P}-pytest-8.patch" + ) + # strip unnecessary pins, upstream doesn't update them a lot sed -i -E -e 's:,?<=?[0-9.]+::' pyproject.toml || die distutils-r1_src_prepare -- cgit v1.2.3