commit: 8c79ac730c27170380fc52c84b080f221edfd941
Author: Henri Gasc <gasc <AT> eurecom <DOT> fr>
AuthorDate: Thu Apr 11 21:04:35 2024 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Thu Apr 11 21:04:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8c79ac73
dev-python/pypandoc: add 1.13, drop 1.11 1.4
Signed-off-by: Henri Gasc <gasc <AT> eurecom.fr>
dev-python/pypandoc/Manifest | 3 +--
.../{pypandoc-1.11.ebuild => pypandoc-1.13.ebuild} | 20 ++++++++++----------
dev-python/pypandoc/pypandoc-1.4.ebuild | 19 -------------------
3 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/dev-python/pypandoc/Manifest b/dev-python/pypandoc/Manifest
index 4ede9a599c..65b8084d62 100644
--- a/dev-python/pypandoc/Manifest
+++ b/dev-python/pypandoc/Manifest
@@ -1,2 +1 @@
-DIST pypandoc-1.11.gh.tar.gz 69118 BLAKE2B
d2a48c6c342325bd8a38ac697616ea5f694fe5928d1538e4ee47d4ffbcdc1c1206e9d68eea214c3edffabef0018cb2950f0cda7e700be5894cb41fe7a7de3446
SHA512
1ca753ac2da9ad1a98c72aa639b6809e31d8c5da85a3a843f91675f95861e5056c183f67d73008c064b8fd2c82a4cd255f20b1c0073cc288a1e0e6a74caa9f94
-DIST pypandoc-1.4.gh.tar.gz 35326 BLAKE2B
8de64056437bb7605adacc6efcb7800c228ecd98e24aed64adae09f8fff921aa260fd35b015db0611c0e2f0331766e7a75443833301467584574283665744c6c
SHA512
e6210c8b63758d09b12f1cef2e755ae70befa2b5cd66034d9981217b2fa684b90bf6b6edc46968abcb775721a0b32467c924866be743dde74fe77a20b94453d5
+DIST pypandoc-1.13.gh.tar.gz 70605 BLAKE2B
36de13986a1f6812491f5e8d893b41baf7d8b170e6804b14d14ee1786786a57e11f4ec22a764ed28dcfa8edbfdc7a90726d0b907bb66e15573a1f587d7c261a8
SHA512
6f7acb4fd113606244a4a6eccac28bc4605e038da19dbb8c86c65b4b6a00aa5bc7cd0a8740145784335b10fb5d12bb85857c41a5a69bfb70c1d845c3738dcfa1
diff --git a/dev-python/pypandoc/pypandoc-1.11.ebuild
b/dev-python/pypandoc/pypandoc-1.13.ebuild
similarity index 60%
rename from dev-python/pypandoc/pypandoc-1.11.ebuild
rename to dev-python/pypandoc/pypandoc-1.13.ebuild
index 9c396f33a3..77de009e84 100644
--- a/dev-python/pypandoc/pypandoc-1.11.ebuild
+++ b/dev-python/pypandoc/pypandoc-1.13.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
DISTUTILS_USE_PEP517="poetry"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1
@@ -16,12 +16,13 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
-RESTRICT="test"
+RESTRICT="!test? ( test )"
-RDEPEND="app-text/pandoc"
+RDEPEND="virtual/pandoc"
BDEPEND="
test? (
>=dev-python/pandocfilters-1.5.0[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
app-text/texlive-core
dev-texlive/texlive-latex
dev-texlive/texlive-fontsrecommended
@@ -29,11 +30,10 @@ BDEPEND="
)
"
+EPYTEST_DESELECT=(
+ tests.py::TestPypandoc::test_basic_conversion_from_http_url
+ tests.py::TestPypandoc::test_pdf_conversion
+)
python_test() {
- # This test wants internet access
- sed -i -e 's:test_basic_conversion_from_http_url:_&:' tests.py || die
- # This one fails for no reason. When not in sandbox mode, the
conversion is made without problems
- sed -i -e 's:test_conversion_with_data_files:_&:' tests.py || die
-
- "${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
+ epytest tests.py
}
diff --git a/dev-python/pypandoc/pypandoc-1.4.ebuild
b/dev-python/pypandoc/pypandoc-1.4.ebuild
deleted file mode 100644
index cf7eac5865..0000000000
--- a/dev-python/pypandoc/pypandoc-1.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1
-
-DESCRIPTION="Pypandoc provides a thin wrapper for pandoc, a universal document
converter"
-HOMEPAGE="https://github.com/JessicaTegner/pypandoc
https://pypi.org/project/pypandoc";
-SRC_URI="https://github.com/JessicaTegner/pypandoc/archive/refs/tags/${PV}.tar.gz
-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="app-text/pandoc"
