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/requests-mock/Manifest | 3 ++- .../files/requests-mock-1.12.0-no-pbr.patch | 22 ++++++++++++++++++++++ .../requests-mock/requests-mock-1.12.0.ebuild | 5 +++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 dev-python/requests-mock/files/requests-mock-1.12.0-no-pbr.patch (limited to 'dev-python/requests-mock') 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 -- cgit v1.2.3