gentoo auto-resync : 16:06:2024 - 00:09:44

4 files changed, 2 insertions, 189 deletions

diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 5b899138926c..609efda55efc 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,8 +1,5 @@
-AUX openpyxl-3.1.2-pytest-8.patch 3319 BLAKE2B dba24fc7ef1164141ac34fb4000936cb8355ff69238a91cada39df2d5018888ff8d1a78f22babd72dbba7162e38d2bdb3e30b36064abb1bd3666b7fbef905ecd SHA512 bb9ca4910743eb66870f4e9d8ff1ee18e54d042a4a638b2d49dd2677b256caa19f454c66b2dfe3601adff132159ae4e998363814117dba2b0cf8e0b33a966a44
-DIST openpyxl-3.1.2.tar.bz2 2733302 BLAKE2B 7030c698c2dfa3c3f27f23485e33cc9f4ffc0c473e590785ebfa03a958f7c1deab98503890b7350f32cbb4607b3fbf543b35299c0f8abfbfcc779e96ddda9ee1 SHA512 307d82dcf839c60be606c01f862701f69017573894c7fd26e35ec3edead2ea2a126aecca61b0c7f6727ff834dd6bed844095b9a56f2b510689ab071926a7a742
 DIST openpyxl-3.1.3.tar.bz2 2739587 BLAKE2B 64161f8ea0629f4bd2ef65187c2d1c0cfa23e155df7b5a4a81c386c48d339956e3d854da040157170852df19ab53d65fd0be9a4f1d4f5b5f6eed20e0fe1e89f9 SHA512 dee9dac201319ed6b3c14cb0cd396148a7caedebb2a95534a1b9fcb75afc445bfd73e67fdbd750334872e4bd3bf1a71d20c48930ff6b195f4f1c6312a5e762f8
 DIST openpyxl-3.1.4.tar.bz2 2738775 BLAKE2B 88236c4a5d49d02f746c0a5393cf0e996ee2864c38e9f9b9774355b5263447dfb73eaa027ae8d710fd81585a99ba5a20f1cbecc6615f153387b94516faea4820 SHA512 f2b4d7566428d3e5ff36be37cfce12c247f90e1ab10cfd4e04e285106b48c4d9b30791a9b1f1c6f388ea063e69d9843801b9f7568d4694cfcd20d4e8d0d723b8
-EBUILD openpyxl-3.1.2.ebuild 1702 BLAKE2B eaad07d111bcf7b16604d2b5fe7cfff9fb410c5adcf8879c95db33842e4ae32d25f55b3fa308a88d3047d0047e4ae4c303ad5b84538c7ab7579295f27c4d3e9c SHA512 a032a1ac383d01c3acd246267348c3b0d6784f66a5b127f271459e71702a065f459e6d35a9e7383af15c1741357e0a027d771e4952690747e5582ad6b8f89c31
-EBUILD openpyxl-3.1.3.ebuild 1225 BLAKE2B 6f1cc837fe66cbef22802eeaaff776eedb2460d31f4f42681d8e1c535a3f94dede4a004e5c6e6288933d945d2256330f5b8a7aa63edbd7ddd6c53e4ce54f57e9 SHA512 09c5e01c7db34f6835e492cdffdeedc2d19d33f3aa41d9d3f4cf9335eddc70111b9e240436b56b05e7ed941c224ce039b624a8406928250974dc753bdc4eafce
+EBUILD openpyxl-3.1.3.ebuild 1219 BLAKE2B 6a8f4eb539999b5ea80578fe4127206cdd4c3b83168450f8c0ef1c14b565448a0628d511424c303537b5d925f80eb6c381d164bfba7002f9b8d7ecd3688ff2bc SHA512 a82292333f5bda3256844e0e725b1261670c0d2334747a3f969bb63acd20c44cea72d83e3fc054676813821e9b3b98fcf9233e0438bd2c40812392466e451752
 EBUILD openpyxl-3.1.4.ebuild 1225 BLAKE2B 6f1cc837fe66cbef22802eeaaff776eedb2460d31f4f42681d8e1c535a3f94dede4a004e5c6e6288933d945d2256330f5b8a7aa63edbd7ddd6c53e4ce54f57e9 SHA512 09c5e01c7db34f6835e492cdffdeedc2d19d33f3aa41d9d3f4cf9335eddc70111b9e240436b56b05e7ed941c224ce039b624a8406928250974dc753bdc4eafce
 MISC metadata.xml 595 BLAKE2B c843c395f1b6a40fea607fa7f851af887fce236ad6fc5b6b77eea0b208954a3340f49ab66a5503f6951346718ecfaf5d43f1a0bbee9b86f4b11c29b1e4cb6394 SHA512 a0cc42713e9c67438050b44c810f17ab4946f8a1eece0159e71d4abe749047dd44ff430605bf5c34af12de2abe4937955c7aade0c5af708ed7f6b816684c8763
diff --git a/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch b/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch
deleted file mode 100644
index 72ed1fab7638..000000000000
--- a/dev-python/openpyxl/files/openpyxl-3.1.2-pytest-8.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 517ce7d21194da275f8083fa2fd7de6977dc7e95 Mon Sep 17 00:00:00 2001
-From: Charlie Clark <charlie.clark@clark-consulting.eu>
-Date: Mon, 11 Mar 2024 13:38:08 +0100
-Subject: [PATCH] Looks like pytest has dropped support for unittest setup
- methods so switched to fixture.
-
---HG--
-branch : 3.1
----
- openpyxl/drawing/tests/test_drawing.py | 46 ++++++++++++++------------
- 1 file changed, 24 insertions(+), 22 deletions(-)
-
-diff --git a/openpyxl/drawing/tests/test_drawing.py b/openpyxl/drawing/tests/test_drawing.py
-index c4c0712dd..befd2267c 100644
---- a/openpyxl/drawing/tests/test_drawing.py
-+++ b/openpyxl/drawing/tests/test_drawing.py
-@@ -1,20 +1,20 @@
- # Copyright (c) 2010-2024 openpyxl
- 
- import pytest
--
- from openpyxl.xml.functions import tostring
--
- from openpyxl.tests.helper import compare_xml
- 
-+@pytest.fixture
-+def Drawing():
-+    from ..drawing import Drawing
-+    return Drawing
-+
- 
- class TestDrawing(object):
- 
--    def setup(self):
--        from ..drawing import Drawing
--        self.drawing = Drawing()
- 
--    def test_ctor(self):
--        d = self.drawing
-+    def test_ctor(self, Drawing):
-+        d = Drawing()
-         assert d.coordinates == ((1, 2), (16, 8))
-         assert d.width == 21
-         assert d.height == 192
-@@ -26,34 +26,34 @@ class TestDrawing(object):
-         assert d.description == ""
-         assert d.name == ""
- 
--    def test_width(self):
--        d = self.drawing
-+    def test_width(self, Drawing):
-+        d = Drawing()
-         d.width = 100
-         d.height = 50
-         assert d.width == 100
- 
--    def test_proportional_width(self):
--        d = self.drawing
-+    def test_proportional_width(self, Drawing):
-+        d = Drawing()
-         d.resize_proportional = True
-         d.width = 100
-         d.height = 50
-         assert (d.width, d.height) == (5, 50)
- 
--    def test_height(self):
--        d = self.drawing
-+    def test_height(self, Drawing):
-+        d = Drawing()
-         d.height = 50
-         d.width = 100
-         assert d.height == 50
- 
--    def test_proportional_height(self):
--        d = self.drawing
-+    def test_proportional_height(self, Drawing):
-+        d = Drawing()
-         d.resize_proportional = True
-         d.height = 50
-         d.width = 100
-         assert (d.width, d.height) == (100, 1000)
- 
--    def test_set_dimension(self):
--        d = self.drawing
-+    def test_set_dimension(self, Drawing):
-+        d = Drawing()
-         d.resize_proportional = True
-         d.set_dimension(100, 50)
-         assert d.width == 6
-@@ -65,8 +65,9 @@ class TestDrawing(object):
- 
- 
-     @pytest.mark.pil_required
--    def test_absolute_anchor(self):
--        node = self.drawing.anchor
-+    def test_absolute_anchor(self, Drawing):
-+        drawing = Drawing()
-+        node = drawing.anchor
-         xml = tostring(node.to_tree())
-         expected = """
-         <absoluteAnchor>
-@@ -80,9 +81,10 @@ class TestDrawing(object):
- 
- 
-     @pytest.mark.pil_required
--    def test_onecell_anchor(self):
--        self.drawing.anchortype =  "oneCell"
--        node = self.drawing.anchor
-+    def test_onecell_anchor(self, Drawing):
-+        drawing = Drawing()
-+        drawing.anchortype =  "oneCell"
-+        node = drawing.anchor
-         xml = tostring(node.to_tree())
-         expected = """
-         <oneCellAnchor>
--- 
-GitLab
-
diff --git a/dev-python/openpyxl/openpyxl-3.1.2.ebuild b/dev-python/openpyxl/openpyxl-3.1.2.ebuild
deleted file mode 100644
index 20b72e6cf240..000000000000
--- a/dev-python/openpyxl/openpyxl-3.1.2.ebuild
+++ /dev/null
@@ -1,66 +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..13} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="
-	https://openpyxl.readthedocs.io/en/stable/
-	https://foss.heptapod.net/openpyxl/openpyxl/
-"
-SRC_URI="
-	https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
-
-RDEPEND="
-	dev-python/et-xmlfile[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
-	)
-"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-PATCHES=(
-	# https://foss.heptapod.net/openpyxl/openpyxl/-/commit/517ce7d21194da275f8083fa2fd7de6977dc7e95
-	"${FILESDIR}/${P}-pytest-8.patch"
-)
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if has_version ">=dev-python/numpy-2[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			# https://foss.heptapod.net/openpyxl/openpyxl/-/issues/2187
-			openpyxl/compat/tests/test_compat.py::test_numpy_tostring
-		)
-	fi
-
-	case ${EPYTHON} in
-		python3.12)
-			EPYTEST_DESELECT+=(
-				# deprecation warnings
-				openpyxl/reader/tests/test_workbook.py::TestWorkbookParser::test_broken_sheet_ref
-				openpyxl/reader/tests/test_workbook.py::TestWorkbookParser::test_defined_names_print_area
-				openpyxl/reader/tests/test_workbook.py::TestWorkbookParser::test_name_invalid_index
-				openpyxl/styles/tests/test_stylesheet.py::test_no_styles
-			)
-			;;
-	esac
-
-	epytest
-}
diff --git a/dev-python/openpyxl/openpyxl-3.1.3.ebuild b/dev-python/openpyxl/openpyxl-3.1.3.ebuild
index e1d43c5174d6..d89a683a1e32 100644
--- a/dev-python/openpyxl/openpyxl-3.1.3.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.1.3.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~arm64-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/et-xmlfile[${PYTHON_USEDEP}]