* [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/, dev-python/docutils/
@ 2019-03-30 23:46 Virgil Dupras
0 siblings, 0 replies; 6+ messages in thread
From: Virgil Dupras @ 2019-03-30 23:46 UTC (permalink / raw
To: gentoo-commits
commit: dcf13f76bb21a31516de3f65a7181b95e261478e
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 23:46:29 2019 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 23:46:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf13f76
dev-python/docutils: remove old
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-python/docutils/Manifest | 1 -
dev-python/docutils/docutils-0.11.ebuild | 68 ----------------------
.../files/docutils-0.11-python3.3-odt-writer.patch | 30 ----------
3 files changed, 99 deletions(-)
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 340341f8816..5babac211ec 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,4 +1,3 @@
-DIST docutils-0.11.tar.gz 1611755 BLAKE2B 78e377bccb949d5ba324b90e0a316b38d8874dee8b82da254b1e442516c8b5788cdafc92feb42a50bfbd5e47ea62c64a90c821d2b7921318a120f9d5600ec6c3 SHA512 8e87581b27ce4fb5e97dcef56047f4bf3a076b98e9e42f5dc66f4c370e5893d1571e46f00fee6f1c8b9f8c8a79e128e4599b9ee213ad1dee2bf16a0246e187df
DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41b5bc1184bf39452f2c90fdae35d77fb52cab3b9fb5c4202541a01508d268c92c98845bbfd1d38e215e4228234d SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9
DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
diff --git a/dev-python/docutils/docutils-0.11.ebuild b/dev-python/docutils/docutils-0.11.ebuild
deleted file mode 100644
index 80f1a11de17..00000000000
--- a/dev-python/docutils/docutils-0.11.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/docutils-0.11-python3.3-odt-writer.patch )
-
-python_compile_all() {
- # Generate html docs from reStructured text sources.
-
- # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
- cp docutils/writers/html4css1/html4css1.css . || die
-
- cd tools || die
- "${PYTHON}" buildhtml.py --input-encoding=utf-8 \
- --stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-python_test() {
- if python_is_python3; then
- pushd test3 > /dev/null || die
- else
- pushd test > /dev/null || die
- fi
- "${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
- popd > /dev/null || die
-}
-
-python_install() {
- distutils-r1_python_install
-
- # Install tools.
- python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
- local doc="${1}"
- local dir="txt/$(dirname ${doc})"
- docinto "${dir}"
- dodoc "${doc}"
-}
-
-python_install_all() {
- local DOCS=( *.txt )
- local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
- distutils-r1_python_install_all
-
- local doc
- while IFS= read -r -d '' doc; do
- install_txt_doc "${doc}"
- done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch b/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch
deleted file mode 100644
index e84256f3dc4..00000000000
--- a/dev-python/docutils/files/docutils-0.11-python3.3-odt-writer.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/docutils/writers/odf_odt/__init__.py
-+++ b/docutils/writers/odf_odt/__init__.py
-@@ -88,16 +88,20 @@
- # that support for the ability to get the parent of an element.
- #
- if WhichElementTree == 'elementtree':
-- class _ElementInterfaceWrapper(etree._ElementInterface):
-+ import weakref
-+ _parents = weakref.WeakKeyDictionary()
-+ if isinstance(etree.Element, type):
-+ _ElementInterface = etree.Element
-+ else:
-+ _ElementInterface = etree._ElementInterface
-+ class _ElementInterfaceWrapper(_ElementInterface):
- def __init__(self, tag, attrib=None):
-- etree._ElementInterface.__init__(self, tag, attrib)
-- if attrib is None:
-- attrib = {}
-- self.parent = None
-+ _ElementInterface.__init__(self, tag, attrib)
-+ _parents[self] = None
- def setparent(self, parent):
-- self.parent = parent
-+ _parents[self] = parent
- def getparent(self):
-- return self.parent
-+ return _parents[self]
-
-
- #
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/, dev-python/docutils/
@ 2019-11-26 3:42 Patrick McLean
0 siblings, 0 replies; 6+ messages in thread
From: Patrick McLean @ 2019-11-26 3:42 UTC (permalink / raw
To: gentoo-commits
commit: 41708338e4666e6f37b85c9fe9afaea64e3a1db8
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Tue Nov 26 03:42:07 2019 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Tue Nov 26 03:42:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41708338
dev-python/docutils-0.15.2: Bump, add py38
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
dev-python/docutils/Manifest | 1 +
dev-python/docutils/docutils-0.15.2.ebuild | 73 ++++++++++++++++++++++
.../docutils/files/docutils-0.15.2-tests.patch | 40 ++++++++++++
3 files changed, 114 insertions(+)
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 5babac211ec..bf166a18389 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,3 +1,4 @@
DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41b5bc1184bf39452f2c90fdae35d77fb52cab3b9fb5c4202541a01508d268c92c98845bbfd1d38e215e4228234d SHA512 0087433f8b76e1d0302d2fab77fdbda941132d16ac1fcecb26ca66119687eefd9e2f6901e05d705f857fa31e2526136c9827dfd57c44cd295bd10dcce3faebf9
DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
+DIST docutils-0.15.2.tar.gz 1797388 BLAKE2B d7f78c37346fe30156335f31bab0fbec420980e08b10806b62ca67135388c161daf758378d74ca4650546d519923444e9343605de125295e3ca271d6109adc73 SHA512 b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6
diff --git a/dev-python/docutils/docutils-0.15.2.ebuild b/dev-python/docutils/docutils-0.15.2.ebuild
new file mode 100644
index 00000000000..036c2fa367c
--- /dev/null
+++ b/dev-python/docutils/docutils-0.15.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7,8}} pypy{,3} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/docutils-0.15.2-tests.patch"
+)
+
+python_compile_all() {
+ # Generate html docs from reStructured text sources.
+
+ # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+ cp docutils/writers/html4css1/html4css1.css . || die
+
+ pushd tools >/dev/null || die
+ "${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+ --stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+ if python_is_python3; then
+ pushd test3 > /dev/null || die
+ else
+ pushd test > /dev/null || die
+ fi
+ "${EPYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ # Install tools.
+ python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+ local doc="${1}"
+ local dir="txt/$(dirname ${doc})"
+ docinto "${dir}"
+ dodoc "${doc}"
+}
+
+python_install_all() {
+ local DOCS=( *.txt )
+ local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+ distutils-r1_python_install_all
+
+ local doc
+ while IFS= read -r -d '' doc; do
+ install_txt_doc "${doc}"
+ done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/files/docutils-0.15.2-tests.patch b/dev-python/docutils/files/docutils-0.15.2-tests.patch
new file mode 100644
index 00000000000..11ccbd01b90
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.15.2-tests.patch
@@ -0,0 +1,40 @@
+diff -ru docutils-0.15.2.orig/test/test_writers/test_odt.py docutils-0.15.2/test/test_writers/test_odt.py
+--- docutils-0.15.2.orig/test/test_writers/test_odt.py 2019-11-25 19:38:23.327374852 -0800
++++ docutils-0.15.2/test/test_writers/test_odt.py 2019-11-25 19:38:13.585433399 -0800
+@@ -38,6 +38,7 @@
+
+ from __init__ import DocutilsTestSupport
+
++import unittest
+ import docutils
+ import docutils.core
+ from docutils._compat import BytesIO
+@@ -146,12 +147,13 @@
+ # xxxx is replaced with a name for the new test.
+ # See instructions above in module doc-string.
+ #
+-
++ @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
+ def test_odt_basic(self):
+ self.process_test('odt_basic.txt', 'odt_basic.odt',
+ save_output_name='odt_basic.odt'
+ )
+
++ @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
+ def test_odt_nested_class(self):
+ self.process_test('odt_nested_class.txt',
+ 'odt_nested_class.odt',
+@@ -166,11 +168,13 @@
+ save_output_name='odt_no_class.odt'
+ )
+
++ @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
+ def test_odt_tables1(self):
+ self.process_test('odt_tables1.txt', 'odt_tables1.odt',
+ save_output_name='odt_tables1.odt'
+ )
+
++ @unittest.skipIf(sys.hexversion > 0x308000, "test is buggy on 3.8")
+ def test_odt_custom_headfoot(self):
+ settings_overrides = {
+ 'custom_header': 'Page %p% of %P%',
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/, dev-python/docutils/
@ 2020-03-02 12:31 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-03-02 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 1a212cc27ee58df3824416c1afca100b9bd96e0a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 2 12:27:14 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 2 12:30:57 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a212cc2
dev-python/docutils: Bump to 0.16
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/docutils/Manifest | 1 +
dev-python/docutils/docutils-0.16.ebuild | 72 ++++++++++++++++++++++
.../docutils/files/docutils-0.16-tests.patch | 66 ++++++++++++++++++++
3 files changed, 139 insertions(+)
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index bf166a18389..e8f81ee81ed 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -2,3 +2,4 @@ DIST docutils-0.12.tar.gz 1618353 BLAKE2B c431e4f2d5ca21235bba860ae7aa4698af0f41
DIST docutils-0.13.1.tar.gz 1735216 BLAKE2B 6229e7de842c6871bcc44a536333f005c5f4691423a4284d72f617bacbdbeb67c0e49e1ee74ce6ebf96e9329d0df2a5acdef306da975551108e74bd557aff4f9 SHA512 6a68b27dac3705ff532cb79d6b6808071206544a1c653e6a24d46971a5e10edffc7d275834eec4e80d948eb066bb099cae0195c0ab674e68747820e54f0ea64e
DIST docutils-0.14.tar.gz 1727105 BLAKE2B d8880918e04ae19ec17ec8aeeaeb44d198a15d7f4c300e08d50b730aa5f753e564391e796b71947c66179ad58fb99e17d11172867d804e0734a17be7dcef3b4b SHA512 1ed72c2ef7d2ca38d1c6f3154b7986ea46f599d9bd826405a5257fdd7740c8626957d6298aa95fb0edea8a24515de22f1ad9b2ecbd59341a1ab7a2bab30f500c
DIST docutils-0.15.2.tar.gz 1797388 BLAKE2B d7f78c37346fe30156335f31bab0fbec420980e08b10806b62ca67135388c161daf758378d74ca4650546d519923444e9343605de125295e3ca271d6109adc73 SHA512 b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6
+DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
diff --git a/dev-python/docutils/docutils-0.16.ebuild b/dev-python/docutils/docutils-0.16.ebuild
new file mode 100644
index 00000000000..3fe18c7551a
--- /dev/null
+++ b/dev-python/docutils/docutils-0.16.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.org/project/docutils/"
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-tests.patch
+)
+
+python_compile_all() {
+ # Generate html docs from reStructured text sources.
+
+ # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+ cp docutils/writers/html4css1/html4css1.css . || die
+
+ cd tools || die
+ "${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
+ --stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+src_test() {
+ cd test || die
+ distutils-r1_src_test
+}
+
+python_test() {
+ "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ # Install tools.
+ python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+ local doc="${1}"
+ local dir="txt/$(dirname ${doc})"
+ docinto "${dir}"
+ dodoc "${doc}"
+}
+
+python_install_all() {
+ local DOCS=( *.txt )
+ local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+ distutils-r1_python_install_all
+
+ local doc
+ while IFS= read -r -d '' doc; do
+ install_txt_doc "${doc}"
+ done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/docutils/files/docutils-0.16-tests.patch b/dev-python/docutils/files/docutils-0.16-tests.patch
new file mode 100644
index 00000000000..052578c727a
--- /dev/null
+++ b/dev-python/docutils/files/docutils-0.16-tests.patch
@@ -0,0 +1,66 @@
+Index: docutils/test/test_parsers/test_rst/test_directives/test_code.py
+===================================================================
+--- docutils/test/test_parsers/test_rst/test_directives/test_code.py (revision 8494)
++++ docutils/test/test_parsers/test_rst/test_directives/test_code.py (working copy)
+@@ -107,7 +107,7 @@
+ <document source="test data">
+ <literal_block classes="code python testclass" xml:space="preserve">
+ \n\
+- <inline classes="keyword">
++ <inline classes="name builtin">
+ print
+ <inline classes="punctuation">
+ (
+@@ -167,7 +167,7 @@
+ <inline classes="ln">
+ 12 \n\
+ \n\
+- <inline classes="keyword">
++ <inline classes="name builtin">
+ print
+ <inline classes="punctuation">
+ (
+Index: docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
+===================================================================
+--- docutils/test/test_parsers/test_rst/test_directives/test_code_long.py (revision 8494)
++++ docutils/test/test_parsers/test_rst/test_directives/test_code_long.py (working copy)
+@@ -69,7 +69,7 @@
+ <inline classes="ln">
+ 12 \n\
+ \n\
+- <inline classes="keyword">
++ <inline classes="name builtin">
+ print
+ <inline classes="punctuation">
+ (
+Index: docutils/test/test_parsers/test_rst/test_directives/test_tables.py
+===================================================================
+--- docutils/test/test_parsers/test_rst/test_directives/test_tables.py (revision 8494)
++++ docutils/test/test_parsers/test_rst/test_directives/test_tables.py (working copy)
+@@ -45,10 +45,11 @@
+ # some error messages changed in Python 3.3, CPython has backported to 2.7.4,
+ # PyPy has not
+ csv_eod_error_str = 'unexpected end of data'
+-if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy':
++if sys.version_info < (2,7,4) or (platform.python_implementation() == 'PyPy'
++ and sys.version_info < (3,0)):
+ csv_eod_error_str = 'newline inside string'
+ # pypy adds a line number
+-if sys.version_info >= (3, 0) and platform.python_implementation() == 'PyPy':
++if platform.python_implementation() == 'PyPy':
+ csv_eod_error_str = 'line 1: ' + csv_eod_error_str
+ csv_unknown_url = "'bogus.csv'"
+ if sys.version_info < (3, 0):
+Index: docutils/test/test_parsers/test_rst/test_interpreted.py
+===================================================================
+--- docutils/test/test_parsers/test_rst/test_interpreted.py (revision 8494)
++++ docutils/test/test_parsers/test_rst/test_interpreted.py (working copy)
+@@ -283,7 +283,7 @@
+ <paragraph>
+ Python code \n\
+ <literal classes="code testclass python">
+- <inline classes="keyword">
++ <inline classes="name builtin">
+ print
+ <inline classes="punctuation">
+ (
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/, dev-python/docutils/
@ 2022-05-14 8:25 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2022-05-14 8:25 UTC (permalink / raw
To: gentoo-commits
commit: 43b2e9dc3ebb32093e79981968df1343217cbf8a
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 07:32:51 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 14 08:25:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b2e9dc
dev-python/docutils: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/docutils/Manifest | 1 -
dev-python/docutils/docutils-0.16-r1.ebuild | 72 ----------------------
.../docutils/files/docutils-0.16-tests.patch | 66 --------------------
3 files changed, 139 deletions(-)
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 9d065584ec16..c8668c1751d2 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,3 +1,2 @@
-DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
DIST docutils-0.18.1.tar.gz 2043249 BLAKE2B 3959199236baade9601d61c3f6d7b6f840fbefdd46d9ea05869fde2cd2c800356a01faba891f51e220c85e66f3029f49f616f2046b85041b674c64825a4242ec SHA512 44404a6cc9d4c1e79c73a6ffee2898e459c9925ab9661e5d41394e13b3d861334cf0c5efcd18e87eb03041374e326cfd00539a6b2ec5979678889e8a536c9542
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
deleted file mode 100644
index 3e297d6f7519..000000000000
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ /dev/null
@@ -1,72 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Documentation Utilities"
-HOMEPAGE="https://docutils.sourceforge.io/ https://pypi.org/project/docutils/"
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-tests.patch
-)
-
-python_compile_all() {
- # Generate html docs from reStructured text sources.
-
- # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
- cp docutils/writers/html4css1/html4css1.css . || die
-
- cd tools || die
- "${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
- --stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
- cd test || die
- distutils-r1_src_test
-}
-
-python_test() {
- "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install
-
- # Install tools.
- python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
- local doc="${1}"
- local dir="txt/$(dirname ${doc})"
- docinto "${dir}"
- dodoc "${doc}"
-}
-
-python_install_all() {
- local DOCS=( *.txt )
- local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
- distutils-r1_python_install_all
-
- local doc
- while IFS= read -r -d '' doc; do
- install_txt_doc "${doc}"
- done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/files/docutils-0.16-tests.patch b/dev-python/docutils/files/docutils-0.16-tests.patch
deleted file mode 100644
index 052578c727a4..000000000000
--- a/dev-python/docutils/files/docutils-0.16-tests.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: docutils/test/test_parsers/test_rst/test_directives/test_code.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_code.py (revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_code.py (working copy)
-@@ -107,7 +107,7 @@
- <document source="test data">
- <literal_block classes="code python testclass" xml:space="preserve">
- \n\
-- <inline classes="keyword">
-+ <inline classes="name builtin">
- print
- <inline classes="punctuation">
- (
-@@ -167,7 +167,7 @@
- <inline classes="ln">
- 12 \n\
- \n\
-- <inline classes="keyword">
-+ <inline classes="name builtin">
- print
- <inline classes="punctuation">
- (
-Index: docutils/test/test_parsers/test_rst/test_directives/test_code_long.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_code_long.py (revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_code_long.py (working copy)
-@@ -69,7 +69,7 @@
- <inline classes="ln">
- 12 \n\
- \n\
-- <inline classes="keyword">
-+ <inline classes="name builtin">
- print
- <inline classes="punctuation">
- (
-Index: docutils/test/test_parsers/test_rst/test_directives/test_tables.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_directives/test_tables.py (revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_directives/test_tables.py (working copy)
-@@ -45,10 +45,11 @@
- # some error messages changed in Python 3.3, CPython has backported to 2.7.4,
- # PyPy has not
- csv_eod_error_str = 'unexpected end of data'
--if sys.version_info < (2,7,4) or platform.python_implementation() == 'PyPy':
-+if sys.version_info < (2,7,4) or (platform.python_implementation() == 'PyPy'
-+ and sys.version_info < (3,0)):
- csv_eod_error_str = 'newline inside string'
- # pypy adds a line number
--if sys.version_info >= (3, 0) and platform.python_implementation() == 'PyPy':
-+if platform.python_implementation() == 'PyPy':
- csv_eod_error_str = 'line 1: ' + csv_eod_error_str
- csv_unknown_url = "'bogus.csv'"
- if sys.version_info < (3, 0):
-Index: docutils/test/test_parsers/test_rst/test_interpreted.py
-===================================================================
---- docutils/test/test_parsers/test_rst/test_interpreted.py (revision 8494)
-+++ docutils/test/test_parsers/test_rst/test_interpreted.py (working copy)
-@@ -283,7 +283,7 @@
- <paragraph>
- Python code \n\
- <literal classes="code testclass python">
-- <inline classes="keyword">
-+ <inline classes="name builtin">
- print
- <inline classes="punctuation">
- (
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/, dev-python/docutils/
@ 2023-07-24 12:56 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2023-07-24 12:56 UTC (permalink / raw
To: gentoo-commits
commit: 107d39ef65230c527b91e45bf87924b5989d3650
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 12:56:29 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 12:56:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=107d39ef
dev-python/docutils: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/docutils/Manifest | 1 -
dev-python/docutils/docutils-0.17.1-r1.ebuild | 76 ------------
.../docutils/files/docutils-0.18.1-py311.patch | 135 ---------------------
3 files changed, 212 deletions(-)
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index fc6c809c69bf..1b240bf273a9 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,3 +1,2 @@
-DIST docutils-0.17.1.tar.gz 2016138 BLAKE2B aa0b6525ba2e3eaebc17010806952ed5f40919876fcb813f50cc05b628dfd22e6073a9a4b2bfe989089ae68d9b7111ae3a97dda2bde5c0536f8fb76c0942fe29 SHA512 5ec2087116bd5356fdffc54f07f6b0355aac5fa9d6caeefa77e8d201fd4706c0d419193c4d9a3964ae493da3091fe2c7dc36b74f81a1e1b9282173658b06e71b
DIST docutils-0.19.tar.gz 2056383 BLAKE2B 9983a905642de4e81ca118578671b503ddfda4bef1afcc0524de40543e1f9617fd8d768ef467da49d2f01076683400bad6a0fe15f6b5a3a1e202c42b2e34ab1b SHA512 fb904a899f2b6f3c07c5079577bd7c52a3182cb85f6a4149391e523498df15bfa317f0c04095b890beeb3f89c2b444875a2a609d880ac4d7fbc3125e46b37ea5
DIST docutils-0.20.1.tar.gz 2058365 BLAKE2B 73fb8302599ffe57b0840c898b0b2e3ccd39ff9ea6eec2b5d345d02c950e1a8357bd821e62733b0484e82bc30e71d30fab381390b0edaef4375b02bcd9eeeb40 SHA512 a0ddca315d03677003036d6a8052ac96fbd3fcc4508564938ea684d79bedb4d322d83449c7b26e55b19b0aadd6e46ca9ac409bb16279a20f06c70e9c15ef5eb0
diff --git a/dev-python/docutils/docutils-0.17.1-r1.ebuild b/dev-python/docutils/docutils-0.17.1-r1.ebuild
deleted file mode 100644
index 4764ca403b5d..000000000000
--- a/dev-python/docutils/docutils-0.17.1-r1.ebuild
+++ /dev/null
@@ -1,76 +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_{9..11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
-HOMEPAGE="
- https://docutils.sourceforge.io/
- https://pypi.org/project/docutils/
-"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
- dev-python/pygments[${PYTHON_USEDEP}]
-"
-BDEPEND="
- ${RDEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}/docutils-0.18.1-py311.patch"
-)
-
-python_compile_all() {
- # Generate html docs from reStructured text sources.
-
- # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
- cp docutils/writers/html4css1/html4css1.css . || die
-
- cd tools || die
- "${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
- --stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
- cd test || die
- distutils-r1_src_test
-}
-
-python_test() {
- "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install
-
- # Install tools.
- python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
- local doc="${1}"
- local dir="txt/$(dirname ${doc})"
- docinto "${dir}"
- dodoc "${doc}"
-}
-
-python_install_all() {
- local DOCS=( *.txt )
- local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
- distutils-r1_python_install_all
-
- local doc
- while IFS= read -r -d '' doc; do
- install_txt_doc "${doc}"
- done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/files/docutils-0.18.1-py311.patch b/dev-python/docutils/files/docutils-0.18.1-py311.patch
deleted file mode 100644
index 878c6f1961db..000000000000
--- a/dev-python/docutils/files/docutils-0.18.1-py311.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-Combination of:
-http://svn.code.sf.net/p/docutils/code/trunk@8910
-http://svn.code.sf.net/p/docutils/code/trunk@8909
-
-diff --git a/test/DocutilsTestSupport.py b/test/DocutilsTestSupport.py
-index 592d3f9df..e1f33aa7a 100644
---- a/test/DocutilsTestSupport.py
-+++ b/test/DocutilsTestSupport.py
-@@ -819,6 +819,7 @@ def exception_data(func, *args, **kwds):
- except Exception as detail:
- return (detail, detail.args,
- '%s: %s' % (detail.__class__.__name__, detail))
-+ return None, [], "No exception"
-
-
- def _format_str(*args):
-diff --git a/test/test_parsers/test_rst/test_directives/test_tables.py b/test/test_parsers/test_rst/test_directives/test_tables.py
-index 07be0122f..73724ed7e 100755
---- a/test/test_parsers/test_rst/test_directives/test_tables.py
-+++ b/test/test_parsers/test_rst/test_directives/test_tables.py
-@@ -65,6 +65,92 @@ def null_bytes():
- next(reader)
-
- null_bytes_exception = DocutilsTestSupport.exception_data(null_bytes)[0]
-+# Null bytes are valid in Python 3.11+:
-+if null_bytes_exception is None:
-+ bad_encoding_result = """\
-+<document source="test data">
-+ <table>
-+ <title>
-+ bad encoding
-+ <tgroup cols="4">
-+ <colspec colwidth="25">
-+ <colspec colwidth="25">
-+ <colspec colwidth="25">
-+ <colspec colwidth="25">
-+ <tbody>
-+ <row>
-+ <entry>
-+ <paragraph>
-+ \xfe\xff"Treat"
-+ <entry>
-+ <paragraph>
-+ "Quantity"
-+ <entry>
-+ <paragraph>
-+ "Description"
-+ <entry>
-+ <row>
-+ <entry>
-+ <paragraph>
-+ "Albatr\u00b0\u00df"
-+ <entry>
-+ <paragraph>
-+ 2.99
-+ <entry>
-+ <paragraph>
-+ "\u00a1Ona\x03\xc3\x03\xc4\x03\xb9\x03\xba!"
-+ <entry>
-+ <row>
-+ <entry>
-+ <paragraph>
-+ "CrunchyFrog"
-+ <entry>
-+ <paragraph>
-+ 1.49
-+ <entry>
-+ <paragraph>
-+ "Ifwetooktheb\u00f6nesout
-+ <entry>
-+ <paragraph>
-+ itwouldn\x20\x19tbe
-+ <row>
-+ <entry>
-+ <paragraph>
-+ crunchy
-+ <entry>
-+ <paragraph>
-+ nowwouldit?"
-+ <entry>
-+ <entry>
-+ <row>
-+ <entry>
-+ <paragraph>
-+ "GannetRipple"
-+ <entry>
-+ <paragraph>
-+ 1.99
-+ <entry>
-+ <paragraph>
-+ "\xbfOna\x03\xc3\x03\xc4\x03\xb9\x03\xba?"
-+ <entry>
-+ <paragraph>
-+ (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
-+"""
-+else:
-+ bad_encoding_result = """\
-+<document source="test data">
-+ <system_message level="3" line="1" source="test data" type="ERROR">
-+ <paragraph>
-+ Error with CSV data in "csv-table" directive:
-+ %s
-+ <literal_block xml:space="preserve">
-+ .. csv-table:: bad encoding
-+ :file: %s
-+ :encoding: latin-1
-+ <paragraph>
-+ (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
-+""" % (null_bytes_exception, utf_16_csv)
-+
-
- totest = {}
-
-@@ -1031,19 +1117,8 @@ u"""\
-
- (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
- """ % utf_16_csv,
--"""\
--<document source="test data">
-- <system_message level="3" line="1" source="test data" type="ERROR">
-- <paragraph>
-- Error with CSV data in "csv-table" directive:
-- %s
-- <literal_block xml:space="preserve">
-- .. csv-table:: bad encoding
-- :file: %s
-- :encoding: latin-1
-- <paragraph>
-- (7- and 8-bit text encoded as UTF-16 has lots of null/zero bytes.)
--""" % (null_bytes_exception, utf_16_csv)],
-+bad_encoding_result
-+],
- ["""\
- .. csv-table:: good encoding
- :file: %s
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/, dev-python/docutils/
@ 2024-05-11 8:13 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2024-05-11 8:13 UTC (permalink / raw
To: gentoo-commits
commit: 96dedb105a728a7acb27a097462c5dae463f9bdd
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 08:06:04 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 11 08:13:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96dedb10
dev-python/docutils: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/docutils/Manifest | 2 -
dev-python/docutils/docutils-0.19.ebuild | 76 ---
dev-python/docutils/docutils-0.21.1.ebuild | 86 ---
.../files/docutils-0.19-pygments-2.14.patch | 672 ---------------------
.../docutils/files/docutils-0.21.1-test.patch | 42 --
5 files changed, 878 deletions(-)
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 79539f23b096..c80b3785c864 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,4 +1,2 @@
-DIST docutils-0.19.tar.gz 2056383 BLAKE2B 9983a905642de4e81ca118578671b503ddfda4bef1afcc0524de40543e1f9617fd8d768ef467da49d2f01076683400bad6a0fe15f6b5a3a1e202c42b2e34ab1b SHA512 fb904a899f2b6f3c07c5079577bd7c52a3182cb85f6a4149391e523498df15bfa317f0c04095b890beeb3f89c2b444875a2a609d880ac4d7fbc3125e46b37ea5
DIST docutils-0.20.1.tar.gz 2058365 BLAKE2B 73fb8302599ffe57b0840c898b0b2e3ccd39ff9ea6eec2b5d345d02c950e1a8357bd821e62733b0484e82bc30e71d30fab381390b0edaef4375b02bcd9eeeb40 SHA512 a0ddca315d03677003036d6a8052ac96fbd3fcc4508564938ea684d79bedb4d322d83449c7b26e55b19b0aadd6e46ca9ac409bb16279a20f06c70e9c15ef5eb0
-DIST docutils-0.21.1.tar.gz 2201080 BLAKE2B a89792a69a7faa0eda7b2470e5e3a3d3cf8250a3577553a8f8f8d3d86d2693394e97dca6c75c1b4815748d2ce126ccd3f71dead5763ec8b70aee7be183165473 SHA512 2816fe074b12d7f15fb6730339f3af5f459f50af0cd2a4922194887f48bfd9931c2f2054a17a5418585b586502b96e05ed18600d31c523084537dc72707ab0ee
DIST docutils-0.21.2.tar.gz 2204444 BLAKE2B 727c2f97fc5835a0ffa62e38ea85af366cd89ad1eaec0b8af8b1f3b12e6cddfddb65161ba34f9109952d37ba2cf8985f3c3b6905ebb2ac1c9a984cce3fb4d170 SHA512 7fafa331f5687448e80d299c20cdccc4b49819fa471b5f586bf0ab18c694ba43a70f58e7c76b0a70a16267585548389214e11a4998ad7fdc19a27f0f7644539c
diff --git a/dev-python/docutils/docutils-0.19.ebuild b/dev-python/docutils/docutils-0.19.ebuild
deleted file mode 100644
index 1bbeb19e0cb4..000000000000
--- a/dev-python/docutils/docutils-0.19.ebuild
+++ /dev/null
@@ -1,76 +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_{9..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
-HOMEPAGE="
- https://docutils.sourceforge.io/
- https://pypi.org/project/docutils/
-"
-
-LICENSE="BSD-2 GPL-3 public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
- dev-python/pygments[${PYTHON_USEDEP}]
-"
-BDEPEND="
- ${RDEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.19-pygments-2.14.patch
-)
-
-python_compile_all() {
- # Generate html docs from reStructured text sources.
-
- # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
- cp docutils/writers/html4css1/html4css1.css . || die
-
- cd tools || die
- "${EPYTHON}" buildhtml.py --input-encoding=utf-8 \
- --stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
- cd test || die
- distutils-r1_src_test
-}
-
-python_test() {
- "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install
-
- # Install tools.
- python_doscript tools/{buildhtml,quicktest}.py
-}
-
-install_txt_doc() {
- local doc="${1}"
- local dir="txt/$(dirname ${doc})"
- docinto "${dir}"
- dodoc "${doc}"
-}
-
-python_install_all() {
- local DOCS=( *.txt )
- local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
- distutils-r1_python_install_all
-
- local doc
- while IFS= read -r -d '' doc; do
- install_txt_doc "${doc}"
- done < <(find docs tools -name '*.txt' -print0)
-}
diff --git a/dev-python/docutils/docutils-0.21.1.ebuild b/dev-python/docutils/docutils-0.21.1.ebuild
deleted file mode 100644
index 773ff8bded58..000000000000
--- a/dev-python/docutils/docutils-0.21.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 optfeature pypi
-
-DESCRIPTION="Python Documentation Utilities (reference reStructuredText impl.)"
-HOMEPAGE="
- https://docutils.sourceforge.io/
- https://pypi.org/project/docutils/
-"
-
-# GPL-3+ only for emacs/rst.el
-LICENSE="BSD BSD-2 GPL-3+ PSF-2.4 public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
-RDEPEND="
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
-"
-BDEPEND="
- ${RDEPEND}
-"
-
-PATCHES=(
- # minimal backport of upstream r9637, r9641
- "${FILESDIR}/${P}-test.patch"
-)
-
-python_compile_all() {
- # Generate html docs from reStructured text sources.
-
- # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
- cp docutils/writers/html4css1/html4css1.css . || die
-
- cd tools || die
- "${EPYTHON}" buildhtml.py --input-encoding=utf-8 --no-datestamp \
- --stylesheet-path=../html4css1.css, --traceback ../docs || die
-}
-
-src_test() {
- cd test || die
- mkdir functional/output || die
- distutils-r1_src_test
-}
-
-python_test() {
- "${EPYTHON}" alltests.py -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install
-
- # Install tools.
- python_doscript tools/buildhtml.py
-}
-
-install_txt_doc() {
- local doc="${1}"
- local dir="txt/$(dirname ${doc})"
- docinto "${dir}"
- dodoc "${doc}"
-}
-
-python_install_all() {
- local DOCS=( *.txt )
- local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
-
- distutils-r1_python_install_all
-
- local doc
- while IFS= read -r -d '' doc; do
- install_txt_doc "${doc}"
- done < <(find docs tools -name '*.txt' -print0)
-}
-
-pkg_postinst() {
- optfeature \
- "auto-detecting the image dimensions when using the 'scale' option" \
- dev-python/pillow
-}
diff --git a/dev-python/docutils/files/docutils-0.19-pygments-2.14.patch b/dev-python/docutils/files/docutils-0.19-pygments-2.14.patch
deleted file mode 100644
index 42324aa49c4d..000000000000
--- a/dev-python/docutils/files/docutils-0.19-pygments-2.14.patch
+++ /dev/null
@@ -1,672 +0,0 @@
-https://bugs.gentoo.org/892213
-https://sourceforge.net/p/docutils/patches/201/
---- a/test/test_parsers/test_rst/test_directives/test_code.py
-+++ b/test/test_parsers/test_rst/test_directives/test_code.py
-@@ -10,14 +10,20 @@ Test the 'code' directive in parsers/rst
-
- if __name__ == '__main__':
- import __init__ # noqa: F401
-+from packaging.version import Version
- from test_parsers import DocutilsTestSupport
--from docutils.utils.code_analyzer import with_pygments
-+from docutils.utils.code_analyzer import with_pygments, pygments_version
-
-
- def suite():
- s = DocutilsTestSupport.ParserTestSuite()
- if not with_pygments:
- del(totest['code-parsing'])
-+ del(totest['code-parsing-2-14'])
-+ elif pygments_version >= Version('2.14.0'):
-+ del(totest['code-parsing'])
-+ else:
-+ del(totest['code-parsing-2-14'])
- s.generateTests(totest)
- return s
-
-@@ -170,6 +176,165 @@ totest['code-parsing'] = [
- \n\
- <inline classes="name builtin">
- print
-+ <inline classes="punctuation">
-+ (
-+ <inline classes="literal number integer">
-+ 8
-+ <inline classes="operator">
-+ /
-+ <inline classes="literal number integer">
-+ 2
-+ <inline classes="punctuation">
-+ )
-+"""],
-+["""\
-+.. code:: latex
-+ :class: testclass
-+
-+ hello \\emph{world} % emphasize
-+""",
-+"""\
-+<document source="test data">
-+ <literal_block classes="code latex testclass" xml:space="preserve">
-+ hello \n\
-+ <inline classes="keyword">
-+ \\emph
-+ <inline classes="name builtin">
-+ {
-+ world
-+ <inline classes="name builtin">
-+ }
-+ \n\
-+ <inline classes="comment">
-+ % emphasize"""],
-+["""\
-+.. code:: rst
-+ :number-lines:
-+
-+ This is a code block with text.
-+""",
-+"""\
-+<document source="test data">
-+ <literal_block classes="code rst" xml:space="preserve">
-+ <inline classes="ln">
-+ 1 \n\
-+ This is a code block with text.
-+"""],
-+["""\
-+Code not parsed but warning silenced in ParserTestCase.
-+
-+.. code:: s-lang
-+
-+ % abc.sl
-+ autoload("abc_mode", "abc");
-+""",
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Code not parsed but warning silenced in ParserTestCase.
-+ <literal_block classes="code s-lang" xml:space="preserve">
-+ % abc.sl
-+ autoload("abc_mode", "abc");
-+"""],
-+["""\
-+Place the language name in a class argument to avoid the no-lexer warning:
-+
-+.. code::
-+ :class: s-lang
-+
-+ % abc.sl
-+ autoload("abc_mode", "abc");
-+""",
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Place the language name in a class argument to avoid the no-lexer warning:
-+ <literal_block classes="code s-lang" xml:space="preserve">
-+ % abc.sl
-+ autoload("abc_mode", "abc");
-+"""],
-+]
-+
-+totest['code-parsing-2-14'] = [
-+["""\
-+.. code:: python3
-+ :class: testclass
-+
-+ print('hello world') # to stdout
-+""",
-+"""\
-+<document source="test data">
-+ <literal_block classes="code python3 testclass" xml:space="preserve">
-+ \n\
-+ <inline classes="name builtin">
-+ print
-+ <inline classes="punctuation">
-+ (
-+ <inline classes="literal string single">
-+ 'hello world'
-+ <inline classes="punctuation">
-+ )
-+ \n\
-+ <inline classes="comment single">
-+ # to stdout
-+"""],
-+["""\
-+.. code:: python3
-+ :class: testclass
-+ :name: my_function
-+ :number-lines: 7
-+
-+ def my_function():
-+ '''Test the lexer.
-+ '''
-+
-+ # and now for something completely different
-+ print(8/2)
-+""",
-+"""\
-+<document source="test data">
-+ <literal_block classes="code python3 testclass" ids="my-function" names="my_function" xml:space="preserve">
-+ <inline classes="ln">
-+ 7 \n\
-+ <inline classes="keyword">
-+ def
-+ \n\
-+ <inline classes="name function">
-+ my_function
-+ <inline classes="punctuation">
-+ ():
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 8 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="literal string doc">
-+ \'\'\'Test the lexer.
-+ <inline classes="ln">
-+ 9 \n\
-+ <inline classes="literal string doc">
-+ \'\'\'
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 10 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 11 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="comment single">
-+ # and now for something completely different
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 12 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="name builtin">
-+ print
- <inline classes="punctuation">
- (
- <inline classes="literal number integer">
---- a/test/test_parsers/test_rst/test_directives/test_code_long.py
-+++ b/test/test_parsers/test_rst/test_directives/test_code_long.py
-@@ -10,15 +10,22 @@ Test the 'code' directive in body.py wit
-
- if __name__ == '__main__':
- import __init__ # noqa: F401
-+from packaging.version import Version
- from test_parsers import DocutilsTestSupport
--from docutils.utils.code_analyzer import with_pygments
-+from docutils.utils.code_analyzer import with_pygments, pygments_version
-
-
- def suite():
- settings = {'syntax_highlight': 'long'}
- s = DocutilsTestSupport.ParserTestSuite(suite_settings=settings)
- if with_pygments:
-+ if pygments_version >= Version('2.14.0'):
-+ del(totest['code-parsing-long'])
-+ else:
-+ del(totest['code-parsing-long-2-14'])
-+
- s.generateTests(totest)
-+
- return s
-
-
-@@ -73,6 +80,94 @@ totest['code-parsing-long'] = [
- \n\
- <inline classes="name builtin">
- print
-+ <inline classes="punctuation">
-+ (
-+ <inline classes="literal number integer">
-+ 8
-+ <inline classes="operator">
-+ /
-+ <inline classes="literal number integer">
-+ 2
-+ <inline classes="punctuation">
-+ )
-+"""],
-+["""\
-+.. code:: latex
-+
-+ hello \\emph{world} % emphasize
-+""",
-+"""\
-+<document source="test data">
-+ <literal_block classes="code latex" xml:space="preserve">
-+ hello \n\
-+ <inline classes="keyword">
-+ \\emph
-+ <inline classes="name builtin">
-+ {
-+ world
-+ <inline classes="name builtin">
-+ }
-+ \n\
-+ <inline classes="comment">
-+ % emphasize"""],
-+]
-+
-+totest['code-parsing-long-2-14'] = [
-+["""\
-+.. code:: python3
-+ :number-lines: 7
-+
-+ def my_function():
-+ '''Test the lexer.
-+ '''
-+
-+ # and now for something completely different
-+ print(8/2)
-+""",
-+"""\
-+<document source="test data">
-+ <literal_block classes="code python3" xml:space="preserve">
-+ <inline classes="ln">
-+ 7 \n\
-+ <inline classes="keyword">
-+ def
-+ \n\
-+ <inline classes="name function">
-+ my_function
-+ <inline classes="punctuation">
-+ ():
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 8 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="literal string doc">
-+ \'\'\'Test the lexer.
-+ <inline classes="ln">
-+ 9 \n\
-+ <inline classes="literal string doc">
-+ \'\'\'
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 10 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 11 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="comment single">
-+ # and now for something completely different
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 12 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="name builtin">
-+ print
- <inline classes="punctuation">
- (
- <inline classes="literal number integer">
---- a/test/test_parsers/test_rst/test_directives/test_include.py
-+++ b/test/test_parsers/test_rst/test_directives/test_include.py
-@@ -10,9 +10,10 @@ Tests for misc.py "include" directive.
- import os.path
- if __name__ == '__main__':
- import __init__ # noqa: F401
-+from packaging.version import Version
- from test_parsers import DocutilsTestSupport
- from docutils import parsers
--from docutils.utils.code_analyzer import with_pygments
-+from docutils.utils.code_analyzer import with_pygments, pygments_version
-
- # optional 3rd-party markdown parser
- md_parser_name = 'recommonmark'
-@@ -27,6 +28,11 @@ def suite():
- # eventually skip optional parts:
- if not with_pygments:
- del(totest['include-code'])
-+ del(totest['include-code-2-14'])
-+ elif pygments_version >= Version('2.14.0'):
-+ del(totest['include-code'])
-+ else:
-+ del(totest['include-code-2-14'])
- if not md_parser_class:
- del(totest['include-markdown'])
- s.generateTests(totest)
-@@ -1191,6 +1197,313 @@ Including includes/include14.txt
- <inline classes="punctuation">
- ..
- \n\
-+ <inline classes="operator word">
-+ include
-+ <inline classes="punctuation">
-+ ::
-+ ../sibling/include7.txt
-+""" % reldir(include6)],
-+["""\
-+Circular inclusion
-+
-+.. include:: %s
-+""" % include15,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Circular inclusion
-+ <paragraph>
-+ File "include15.txt": example of rekursive inclusion.
-+ <paragraph>
-+ File "include16.txt": example of rekursive inclusion.
-+ <system_message level="2" line="3" source="%s" type="WARNING">
-+ <paragraph>
-+ circular inclusion in "include" directive:
-+ %s
-+ > %s
-+ > %s
-+ > test data
-+ <literal_block xml:space="preserve">
-+ .. include:: include15.txt
-+ <paragraph>
-+ No loop when clipping before the "include" directive:
-+ <paragraph>
-+ File "include15.txt": example of rekursive inclusion.
-+""" % (reldir(include16), reldir(include15),
-+ reldir(include16), reldir(include15))],
-+["""\
-+Circular inclusion with clipping.
-+
-+.. include:: %s
-+ :start-line: 2
-+""" % include16,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Circular inclusion with clipping.
-+ <paragraph>
-+ File "include15.txt": example of rekursive inclusion.
-+ <paragraph>
-+ File "include16.txt": example of rekursive inclusion.
-+ <system_message level="2" line="3" source="%s" type="WARNING">
-+ <paragraph>
-+ circular inclusion in "include" directive:
-+ %s
-+ > %s
-+ > %s
-+ > %s
-+ > test data
-+ <literal_block xml:space="preserve">
-+ .. include:: include15.txt
-+ <paragraph>
-+ No loop when clipping before the "include" directive:
-+ <paragraph>
-+ File "include15.txt": example of rekursive inclusion.
-+ <paragraph>
-+ No loop when clipping before the "include" directive:
-+ <paragraph>
-+ File "include15.txt": example of rekursive inclusion.
-+""" % (reldir(include16), reldir(include15), reldir(include16),
-+ reldir(include15), reldir(include16))],
-+["""\
-+Circular inclusion with specified parser.
-+
-+.. include:: %s
-+ :parser: rst
-+""" % include15,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Circular inclusion with specified parser.
-+ <paragraph>
-+ File "include15.txt": example of rekursive inclusion.
-+ <paragraph>
-+ File "include16.txt": example of rekursive inclusion.
-+ <system_message level="2" line="3" source="%s" type="WARNING">
-+ <paragraph>
-+ circular inclusion in "include" directive:
-+ %s
-+ > %s
-+ > %s
-+ > test data
-+ <literal_block xml:space="preserve">
-+ .. include:: include15.txt
-+ <paragraph>
-+ No loop when clipping before the "include" directive:
-+ <paragraph>
-+ File "include15.txt": example of rekursive inclusion.
-+""" % (reldir(include16), reldir(include15),
-+ reldir(include16), reldir(include15))],
-+["""\
-+No circular inclusion.
-+
-+============================= =============================
-+.. include:: data/include.txt .. include:: data/include.txt
-+============================= =============================
-+""",
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ No circular inclusion.
-+ <table>
-+ <tgroup cols="2">
-+ <colspec colwidth="29">
-+ <colspec colwidth="29">
-+ <tbody>
-+ <row>
-+ <entry>
-+ <paragraph>
-+ Some include text.
-+ <entry>
-+ <paragraph>
-+ Some include text."""],
-+]
-+
-+totest['include-code-2-14'] = [
-+["""\
-+Included code
-+
-+.. include:: %s
-+ :code: rst
-+""" % include1,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Included code
-+ <literal_block classes="code rst" source="%s" xml:space="preserve">
-+ <inline classes="generic heading">
-+ Inclusion 1
-+ \n\
-+ <inline classes="generic heading">
-+ -----------
-+ \n\
-+ <inline classes="whitespace">
-+ \n\
-+ This file is used by \n\
-+ <inline classes="literal string">
-+ ``test_include.py``
-+ .
-+""" % reldir(include1)],
-+["""\
-+Included code
-+
-+.. include:: %s
-+ :code: rst
-+ :number-lines:
-+""" % include1,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Included code
-+ <literal_block classes="code rst" source="%s" xml:space="preserve">
-+ <inline classes="ln">
-+ 1 \n\
-+ <inline classes="generic heading">
-+ Inclusion 1
-+ \n\
-+ <inline classes="ln">
-+ 2 \n\
-+ <inline classes="generic heading">
-+ -----------
-+ \n\
-+ <inline classes="ln">
-+ 3 \n\
-+ <inline classes="whitespace">
-+ \n\
-+ <inline classes="ln">
-+ 4 \n\
-+ <inline classes="whitespace">
-+ This file is used by \n\
-+ <inline classes="literal string">
-+ ``test_include.py``
-+ .
-+""" % reldir(include1)],
-+["""\
-+TAB expansion with included code:
-+
-+.. include:: %s
-+ :code: rst
-+""" % include_literal,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ TAB expansion with included code:
-+ <literal_block classes="code rst" source="%s" xml:space="preserve">
-+ Literal included this should \n\
-+ <inline classes="generic strong">
-+ **not**
-+ be \n\
-+ <inline classes="generic emph">
-+ *marked*
-+ \n\
-+ <inline classes="name variable">
-+ `up`
-+ .
-+ <inline classes="whitespace">
-+ \n\
-+ <- leading raw tab.
-+ <inline classes="whitespace">
-+ \n\
-+ \n\
-+ Newlines
-+ <inline classes="whitespace">
-+ \n\
-+ are
-+ <inline classes="whitespace">
-+ \n\
-+ normalized.
-+""" % include_literal],
-+["""\
-+Custom TAB expansion with included code:
-+
-+.. include:: %s
-+ :code: rst
-+ :tab-width: 2
-+""" % include_literal,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Custom TAB expansion with included code:
-+ <literal_block classes="code rst" source="%s" xml:space="preserve">
-+ Literal included this should \n\
-+ <inline classes="generic strong">
-+ **not**
-+ be \n\
-+ <inline classes="generic emph">
-+ *marked*
-+ \n\
-+ <inline classes="name variable">
-+ `up`
-+ .
-+ <inline classes="whitespace">
-+ \n\
-+ <- leading raw tab.
-+ <inline classes="whitespace">
-+ \n\
-+ \n\
-+ Newlines
-+ <inline classes="whitespace">
-+ \n\
-+ are
-+ <inline classes="whitespace">
-+ \n\
-+ normalized.
-+""" % include_literal],
-+["""\
-+Custom TAB expansion with included code:
-+
-+.. include:: %s
-+ :code: rst
-+ :tab-width: -1
-+""" % include_literal,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Custom TAB expansion with included code:
-+ <literal_block classes="code rst" source="%s" xml:space="preserve">
-+ Literal included this should \n\
-+ <inline classes="generic strong">
-+ **not**
-+ be \n\
-+ <inline classes="generic emph">
-+ *marked*
-+ \n\
-+ <inline classes="name variable">
-+ `up`
-+ .
-+ <inline classes="whitespace">
-+ \n\
-+ \t<- leading raw tab.
-+ <inline classes="whitespace">
-+ \n\
-+ \n\
-+ Newlines
-+ <inline classes="whitespace">
-+ \n\
-+ are
-+ <inline classes="whitespace">
-+ \n\
-+ normalized.
-+""" % include_literal],
-+["""\
-+Including includes/include14.txt
-+
-+.. include:: %s
-+""" % include14,
-+"""\
-+<document source="test data">
-+ <paragraph>
-+ Including includes/include14.txt
-+ <paragraph>
-+ Including more/include6.txt as rst-code from includes/include14.txt:
-+ <literal_block classes="code rst" source="%s" xml:space="preserve">
-+ In includes/more/include6.txt
-+ <inline classes="whitespace">
-+ \n\
-+ \n\
-+ <inline classes="punctuation">
-+ ..
-+ \n\
- <inline classes="operator word">
- include
- <inline classes="punctuation">
---- a/docutils/utils/code_analyzer.py
-+++ b/docutils/utils/code_analyzer.py
-@@ -9,11 +9,14 @@
- from docutils import ApplicationError
- try:
- import pygments
-+ from packaging.version import Version
- from pygments.lexers import get_lexer_by_name
- from pygments.formatters.html import _get_ttype_class
- with_pygments = True
-+ pygments_version = Version(pygments.__version__)
- except ImportError:
- with_pygments = False
-+ pygments_version = '0'
-
- # Filter the following token types from the list of class arguments:
- unstyled_tokens = ['token', # Token (base token type)
-
-
diff --git a/dev-python/docutils/files/docutils-0.21.1-test.patch b/dev-python/docutils/files/docutils-0.21.1-test.patch
deleted file mode 100644
index 507fd239c166..000000000000
--- a/dev-python/docutils/files/docutils-0.21.1-test.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/test/test_writers/test_html5_polyglot_parts.py b/test/test_writers/test_html5_polyglot_parts.py
-index fb2792ee7..cb03fea2f 100644
---- a/test/test_writers/test_html5_polyglot_parts.py
-+++ b/test/test_writers/test_html5_polyglot_parts.py
-@@ -24,11 +24,20 @@ if __name__ == '__main__':
-
- import docutils
- import docutils.core
-+from docutils.parsers.rst.directives.images import PIL
- from docutils.utils.code_analyzer import with_pygments
-
- ROOT_PREFIX = (Path(__file__).parent.parent/'functional'/'input').as_posix()
- DATA_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', 'data'))
-
-+with_pygments = False
-+PIL_NOT_FOUND_PATH = 'dummy.png'
-+try:
-+ if PIL and (tuple(int(i) for i in PIL.__version__.split('.')) >= (10, 3)):
-+ PIL_NOT_FOUND_PATH = Path('dummy.png').resolve()
-+except:
-+ PIL = None
-+
-
- class Html5WriterPublishPartsTestCase(unittest.TestCase):
- """Test case for HTML writer via the publish_parts interface."""
-@@ -642,14 +651,14 @@ totest['system_messages'] = ({'stylesheet_path': '',
- .. image:: dummy.mp4
- :scale: 100%
- """,
--{'fragment': """\
-+{'fragment': f"""\
- <img alt="dummy.png" src="dummy.png" />
- <aside class="system-message">
- <p class="system-message-title">System Message: WARNING/2 \
- (<span class="docutils literal"><string></span>, line 1)</p>
- <p>Cannot scale image!
- Could not get size from "dummy.png":
-- [Errno 2] No such file or directory: 'dummy.png'</p>
-+ [Errno 2] No such file or directory: '{PIL_NOT_FOUND_PATH}'</p>
- </aside>
- <aside class="system-message">
- <p class="system-message-title">System Message: ERROR/3 \
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-05-11 8:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-24 12:56 [gentoo-commits] repo/gentoo:master commit in: dev-python/docutils/files/, dev-python/docutils/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-05-11 8:13 Michał Górny
2022-05-14 8:25 Michał Górny
2020-03-02 12:31 Michał Górny
2019-11-26 3:42 Patrick McLean
2019-03-30 23:46 Virgil Dupras
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox