* [gentoo-commits] repo/gentoo:master commit in: app-text/xlsx2csv/files/, app-text/xlsx2csv/
@ 2023-01-20 13:29 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2023-01-20 13:29 UTC (permalink / raw
To: gentoo-commits
commit: 68b7a096e41387c5912995e33ebaad9f840571ea
Author: Anton Fischl <github <AT> fischl-online <DOT> de>
AuthorDate: Tue Jan 10 06:40:11 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 13:29:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b7a096
app-text/xlsx2csv: bump 0.8.0
Signed-off-by: Anton Fischl <github <AT> fischl-online.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-text/xlsx2csv/Manifest | 1 +
app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch | 13 ++++++++
app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild | 35 ++++++++++++++++++++++
3 files changed, 49 insertions(+)
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index 1f9a7ac7c375..d4c75dbb6f6c 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1 +1,2 @@
DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489
+DIST xlsx2csv-0.8.0.tar.gz 208842 BLAKE2B bfe69c39a8312feec35bb9a8079982f0765cbe975ce9d842ccd969d1399d03202ddf8d41c54f5129d122f535272add38c1489c0804340cc24bf1091779d76a2c SHA512 dd9ced043f347d420371aaf68f65b1ae827f231ceddbfb051174c8072dda27f989490120d0ee6bbe1fb25faf79944242144e196ccf58db5c537d5b0826cb91ee
diff --git a/app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch b/app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch
new file mode 100644
index 000000000000..f692a4931522
--- /dev/null
+++ b/app-text/xlsx2csv/files/xlsx2csv-0.7.8-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/test/run b/test/run
+index 990421c..081729d 100755
+--- a/test/run
++++ b/test/run
+@@ -5,7 +5,7 @@ import sys
+ import subprocess
+ from io import open
+
+-PYTHON_VERSIONS = ["2", "3"]
++PYTHON_VERSIONS = ["3"]
+
+ """
+ This test uses sys.stdout.
diff --git a/app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild b/app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild
new file mode 100644
index 000000000000..38e7ce7168da
--- /dev/null
+++ b/app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Convert MS Office xlsx files to CSV"
+HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-lang/perl"
+
+PATCHES=( "${FILESDIR}"/"${PN}-0.7.8-tests.patch" )
+
+python_compile_all() {
+ emake -C man
+}
+
+python_test() {
+ "${EPYTHON}" test/run || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ doman "man/${PN}.1"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-text/xlsx2csv/files/, app-text/xlsx2csv/
@ 2023-05-07 7:22 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2023-05-07 7:22 UTC (permalink / raw
To: gentoo-commits
commit: dec34c9b92911fe019193b8084e9c46c18104eba
Author: Anton Fischl <github <AT> fischl-online <DOT> de>
AuthorDate: Thu Apr 20 04:59:26 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun May 7 07:22:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dec34c9b
app-text/xlsx2csv: remove 0.7.6, 0.8.1
Closes: https://github.com/gentoo/gentoo/pull/30660
Signed-off-by: Anton Fischl <github <AT> fischl-online.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
app-text/xlsx2csv/Manifest | 2 -
app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch | 61 ----------------------
app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild | 35 -------------
app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild | 34 ------------
4 files changed, 132 deletions(-)
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index 3d58d5650340..5c7f1803af9a 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,3 +1 @@
-DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489
-DIST xlsx2csv-0.8.0.tar.gz 208842 BLAKE2B bfe69c39a8312feec35bb9a8079982f0765cbe975ce9d842ccd969d1399d03202ddf8d41c54f5129d122f535272add38c1489c0804340cc24bf1091779d76a2c SHA512 dd9ced043f347d420371aaf68f65b1ae827f231ceddbfb051174c8072dda27f989490120d0ee6bbe1fb25faf79944242144e196ccf58db5c537d5b0826cb91ee
DIST xlsx2csv-0.8.1.tar.gz 215741 BLAKE2B 0fcfe8177bc9d50d0986bea45373be8efb80753a53054bb254ab6fa93a4f4e038d1b7b991f1fb3850e9cd928f4aacfc3b0a927edbaacd77065eb6dc8067cc227 SHA512 0d091a3912a3c0a10837acb2bf1a4c42478a891b0c9cfaceb74a8e511425c63360f24cb08db138ec51a7c189f0b76f3901789edb45f894ab8926dd4c458c7ff5
diff --git a/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch b/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch
deleted file mode 100644
index f3e04b827bd0..000000000000
--- a/app-text/xlsx2csv/files/xlsx2csv-0.7.6-tests.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- xlsx2csv-0.7.6/test/run
-+++ xlsx2csv-0.7.6/test/run
-@@ -5,8 +5,6 @@
- import subprocess
- from io import open
-
--PYTHON_VERSIONS = ["2.7"]
--
- """
- This test uses sys.stdout.
- That means this test doesn't verify:
-@@ -16,31 +14,24 @@
-
- def compare(case, arguments=[]):
- failed = False
-- for pyver in PYTHON_VERSIONS:
-- ext = "xlsx"
-- if os.path.exists("test/%s.xlsm" % case):
-- ext = "xlsm"
--
-- if os.name == 'posix':# in case of Linux
-- left = subprocess.check_output(["python%s" %pyver, "./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','')
-- elif os.name == 'nt':# in case of Windows
-- # Use py.exe http://blog.python.org/2011/07/python-launcher-for-windows_11.html on Windows
-- left = subprocess.check_output(["py", "-%s" %pyver, "./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','')
-- else:
-- print("os.name is unexpected: "+os.name)
-- sys.exit(1)
--
-- f = open("test/%s.csv" %case, "r", encoding="utf-8", newline="")
-- right = f.read().replace('\r','')
-- f.close()
--
-- if left != right:
-- print("FAILED: %s %s" %(case, pyver))
-- print(" actual:", left.replace("\r", "\\r").replace("\n", "\\n"))
-- print(" expected:", right.replace("\r", "\\r").replace("\n", "\\n"))
-- failed = True
-- else:
-- print("OK: %s %s" %(case, pyver))
-+ ext = "xlsx"
-+ if os.path.exists("test/%s.xlsm" % case):
-+ ext = "xlsm"
-+
-+ left = subprocess.check_output(["./xlsx2csv.py"] + arguments + ["test/%s.%s" %(case, ext)]).decode('utf-8').replace('\r','')
-+
-+ f = open("test/%s.csv" %case, "r", encoding="utf-8", newline="")
-+ right = f.read().replace('\r','')
-+ f.close()
-+
-+ if left != right:
-+ print("FAILED: %s" % (case,))
-+ print(" actual:", left.replace("\r", "\\r").replace("\n", "\\n"))
-+ print(" expected:", right.replace("\r", "\\r").replace("\n", "\\n"))
-+ failed = True
-+ else:
-+ print("OK: %s" % (case,))
-+
- if failed:
- sys.exit(1)
-
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
deleted file mode 100644
index b5b221a9924d..000000000000
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Convert MS Office xlsx files to CSV"
-HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-lang/perl"
-
-PATCHES=( "${FILESDIR}"/${P}-tests.patch )
-
-python_compile_all() {
- emake -C man
-}
-
-python_test() {
- "${EPYTHON}" test/run || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman man/${PN}.1
-}
diff --git a/app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild b/app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild
deleted file mode 100644
index 7b0deef9b9c3..000000000000
--- a/app-text/xlsx2csv/xlsx2csv-0.8.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="xml(+)"
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Convert MS Office xlsx files to CSV"
-HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="dev-lang/perl"
-
-PATCHES=( "${FILESDIR}"/"${PN}-0.7.8-tests.patch" )
-
-python_compile_all() {
- emake -C man
-}
-
-python_test() {
- "${EPYTHON}" test/run || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- doman "man/${PN}.1"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-07 7:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-20 13:29 [gentoo-commits] repo/gentoo:master commit in: app-text/xlsx2csv/files/, app-text/xlsx2csv/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-05-07 7:22 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox