* [gentoo-commits] repo/gentoo:master commit in: dev-python/openpyxl/, dev-python/openpyxl/files/
@ 2021-05-29 18:11 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-05-29 18:11 UTC (permalink / raw
To: gentoo-commits
commit: d683b1d20bba790c05244b9b53925170ad6457b7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 29 17:23:59 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 29 18:09:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d683b1d2
dev-python/openpyxl: Fix python_requires in metadata
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch | 12 ++++++++++++
.../{openpyxl-3.0.7.ebuild => openpyxl-3.0.7-r1.ebuild} | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch b/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
new file mode 100644
index 00000000000..08349787e6f
--- /dev/null
+++ b/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
@@ -0,0 +1,12 @@
+diff -dupr a/setup.py b/setup.py
+--- a/setup.py 2021-05-29 19:21:13.876463476 +0200
++++ b/setup.py 2021-05-29 19:21:21.986626313 +0200
+@@ -74,7 +74,7 @@ setup(
+ author_email=__author_email__,
+ url=__url__,
+ license=__license__,
+- python_requires=">=3.6, ",
++ python_requires=">=3.6",
+ install_requires=[
+ 'et_xmlfile',
+ ],
diff --git a/dev-python/openpyxl/openpyxl-3.0.7.ebuild b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
similarity index 92%
rename from dev-python/openpyxl/openpyxl-3.0.7.ebuild
rename to dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
index d78f064d072..b5ef708e1be 100644
--- a/dev-python/openpyxl/openpyxl-3.0.7.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
@@ -27,3 +27,7 @@ BDEPEND="
distutils_enable_sphinx doc
distutils_enable_tests pytest
+
+PATCHES=(
+ "${FILESDIR}"/openpyxl-3.0.7-metadata.patch
+)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/openpyxl/, dev-python/openpyxl/files/
@ 2021-10-16 5:59 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2021-10-16 5:59 UTC (permalink / raw
To: gentoo-commits
commit: bcea1fa2701304105d7be5f33cab737eae4de510
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 16 05:59:00 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 16 05:59:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcea1fa2
dev-python/openpyxl: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/openpyxl/Manifest | 2 --
.../openpyxl/files/openpyxl-3.0.7-metadata.patch | 12 --------
dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild | 33 ----------------------
dev-python/openpyxl/openpyxl-3.0.8.ebuild | 29 -------------------
4 files changed, 76 deletions(-)
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index b6958dab39d..d669466fb72 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,3 +1 @@
-DIST openpyxl-3.0.7.tar.bz2 2426608 BLAKE2B 5ce0a34ea4ec8f33da2224555f3d681c4cfa2145f4cba10ed182044e6a6d69ce61c500c51a26db7ded2a3a0e778d0d8e2bd996c3852732f565501f233b145db7 SHA512 bd697c353d0a9fe66a7947dc0f51530b8419e39b36833e5322cca544fafcbd6aba36e42e53c1a1672f44b3940de9b91417bc58955c87257b7b82782c480ef738
-DIST openpyxl-3.0.8.tar.bz2 2514689 BLAKE2B a640104c4afcafa5dad8615986a0d3acdac563c60c0ae4b6301978f2257dfbf64eb9413cfdea690600d6c267cc104e3667f51e1ebb23a2c8e74908c1aaeb62ed SHA512 921ee6e37a7242bf807cda3a86ba224edc80c64623b6cf0d3f344217485b53bcddbdd2a81a35bd8e80fe0dc9637d6c08988c191fb4a905287a8af340b97fadf3
DIST openpyxl-3.0.9.tar.bz2 2428070 BLAKE2B b62133ee8e732142428b4f9eaf158e6f33daf314ed1ad620d921ad10265d1db93e2fcef807a61b3277e96f245392fd19b48da715eb0c560c882683fb1407f7a1 SHA512 33c313c842a43003a6e056b58869652377bef74bcaf267c50cc49f6abb7caa8a1b4e8f3b400a054f7d1776e03763ebebc984d331520bd63411ec4acfa8a03787
diff --git a/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch b/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
deleted file mode 100644
index 08349787e6f..00000000000
--- a/dev-python/openpyxl/files/openpyxl-3.0.7-metadata.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dupr a/setup.py b/setup.py
---- a/setup.py 2021-05-29 19:21:13.876463476 +0200
-+++ b/setup.py 2021-05-29 19:21:21.986626313 +0200
-@@ -74,7 +74,7 @@ setup(
- author_email=__author_email__,
- url=__url__,
- license=__license__,
-- python_requires=">=3.6, ",
-+ python_requires=">=3.6",
- install_requires=[
- 'et_xmlfile',
- ],
diff --git a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild b/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
deleted file mode 100644
index 83804875c02..00000000000
--- a/dev-python/openpyxl/openpyxl-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 x86"
-
-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
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/openpyxl-3.0.7-metadata.patch
-)
diff --git a/dev-python/openpyxl/openpyxl-3.0.8.ebuild b/dev-python/openpyxl/openpyxl-3.0.8.ebuild
deleted file mode 100644
index 23c8e219fb6..00000000000
--- a/dev-python/openpyxl/openpyxl-3.0.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
-HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-# Upstream doesn't want to include tests in PyPI tarballs
-SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~x86"
-
-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
-distutils_enable_tests pytest
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/openpyxl/, dev-python/openpyxl/files/
@ 2024-06-15 8:41 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-06-15 8:41 UTC (permalink / raw
To: gentoo-commits
commit: 1353d10171076fff5823b57772855e465cd0c8be
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 08:39:33 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 08:41:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1353d101
dev-python/openpyxl: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/openpyxl/Manifest | 1 -
.../openpyxl/files/openpyxl-3.1.2-pytest-8.patch | 118 ---------------------
dev-python/openpyxl/openpyxl-3.1.2.ebuild | 66 ------------
3 files changed, 185 deletions(-)
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 5787eaec1862..6272b23492cc 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,3 +1,2 @@
-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
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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-15 8:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-16 5:59 [gentoo-commits] repo/gentoo:master commit in: dev-python/openpyxl/, dev-python/openpyxl/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-06-15 8:41 Michał Górny
2021-05-29 18:11 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox