From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- dev-python/nbconvert/Manifest | 4 - .../files/nbconvert-5.6.1-inkscape-1.patch | 159 --------------------- .../nbconvert/files/nbconvert-5.6.1-py39.patch | 27 ---- dev-python/nbconvert/nbconvert-5.6.1.ebuild | 70 --------- 4 files changed, 260 deletions(-) delete mode 100644 dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch delete mode 100644 dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch delete mode 100644 dev-python/nbconvert/nbconvert-5.6.1.ebuild (limited to 'dev-python/nbconvert') diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest index 13617ada1f41..fbe6453b129e 100644 --- a/dev-python/nbconvert/Manifest +++ b/dev-python/nbconvert/Manifest @@ -1,7 +1,3 @@ -AUX nbconvert-5.6.1-inkscape-1.patch 6526 BLAKE2B f3baf2b80321e63a261ad281c81818d95bde8f719382cb8a4b2a2d4511e7c102658fcfec9f86067bb0c296caf9b164842986bb664ca7dc9184206e2a76b20221 SHA512 880385a0c42e185f01521ee26fe9d859c99c6ba3477e5b71d292cc0f6b4998a2b9c4ec0dcff5a30ca3fce261769c3481ec320b6c0ca0e0f46dd493e72b7267b3 -AUX nbconvert-5.6.1-py39.patch 1199 BLAKE2B 7ddcc42c81e9d86007142f3f5c6ce9a88b1ead4400c1e65f3c816e97fbc707eea3bd71a5bf64e6266678c1935a678321230a30d92522f6188f19d3273028647a SHA512 f9590d808cadea8a2c95079dbfe4aac4339ecddcb204e7b57a8c62f4cfd0545d17961b01599ec3f4ce52d772175be43ad441a0ebc56d52e6332fda11110f5463 -DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435 DIST nbconvert-6.0.7.tar.gz 896833 BLAKE2B 1b5b39144509aa9f61dc1e9675b112d69ed2e2f9859f3ce7ccfac517d89fff0010062c03ded1c3db571c84dd8d4f8ba12e4851245f370d2e671d24921dd50ab6 SHA512 3c78fa4d777a79a08606a39bb31f6b329dc9d28c1ef2ea9f3253746dce853a295e8fe85b14c65b04762aa5acd5facc879232a375875a2ca6dc9477cc1ab88786 -EBUILD nbconvert-5.6.1.ebuild 1774 BLAKE2B e63b986fd418ce6d54ee612cc2add3ec95c29608c158c07684fdfea0d068c7920039c8a557c28027c7e038cac93a50f47ac5f2ed9b2b5134c24411c47541f00e SHA512 769089b76c9c9d8c1ef6f982198a7e3cf309aca6417f9eae1424beac9d9e97f17fd6e0c00aca7c87df75e2aed1495750a66fd584d6994b98cd2e8d15b76a9473 EBUILD nbconvert-6.0.7.ebuild 2007 BLAKE2B 6b9724e63d42137b35cac765d57dbb9dd0adaac784935f1f468566213a9b893ffc96ea8a223750cc93c93d6ffe8c17c102d2b0765509786749bfe846b858f96e SHA512 86e8e6e793d169bd302f68211c2024dc979e67c3a02df147d43a41577029bbdc6b3cd1bba27ab0d561269e87c449d966824e52136e7ef03db4918a13cedf6c47 MISC metadata.xml 526 BLAKE2B 8dc0ccbe9aabcdc429a5559dc79beecd4937384f3c4d84d610f04fcc347c3b5746bfba4d096ef5251003a4f81e1159663fbe338a7d5dd0dcd19b9c97c43bc1f0 SHA512 ec7ec447bab3315501d428a1f3a1bcd6e512b028982985af9862334397d4d06c837f9e40628a6b750dc4bdb9844d2ad3fd3b4b44c8f1066e5f0fbd4e8ce1cd96 diff --git a/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch b/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch deleted file mode 100644 index 1f997a3c3a32..000000000000 --- a/dev-python/nbconvert/files/nbconvert-5.6.1-inkscape-1.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git a/nbconvert/preprocessors/svg2pdf.py b/nbconvert/preprocessors/svg2pdf.py -index aff14d9f..de51f3b8 100644 ---- a/nbconvert/preprocessors/svg2pdf.py -+++ b/nbconvert/preprocessors/svg2pdf.py -@@ -1,4 +1,4 @@ --"""Module containing a preprocessor that converts outputs in the notebook from -+"""Module containing a preprocessor that converts outputs in the notebook from - one format to another. - """ - -@@ -17,11 +17,7 @@ from traitlets import Unicode, default - - from .convertfigures import ConvertFiguresPreprocessor - --if sys.version_info >= (3,3): -- from shutil import which -- get_inkscape_path = which('inkscape') --else: -- get_inkscape_path = None -+from shutil import which - - - INKSCAPE_APP = '/Applications/Inkscape.app/Contents/Resources/bin/inkscape' -@@ -46,26 +42,49 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor): - def _to_format_default(self): - return 'application/pdf' - -+ inkscape_version = Unicode( -+ help="""The version of inkscpae being used. -+ -+ This affects how the conversion command is run. -+ """ -+ ).tag(config=True) -+ -+ @default('inkscape_version') -+ def _inkscape_version_default(self): -+ p = subprocess.Popen([self.inkscape, '--version'], -+ stdout=subprocess.PIPE, -+ stderr=subprocess.PIPE) -+ output, _ = p.communicate() -+ if p.returncode != 0: -+ raise RuntimeError("Unable to find inkscape executable --version") -+ return output.decode('utf-8').split(' ')[1] -+ - command = Unicode( - help="""The command to use for converting SVG to PDF -- -+ - This string is a template, which will be formatted with the keys - to_filename and from_filename. -- -+ - The conversion call must read the SVG from {from_filename}, - and write a PDF to {to_filename}. - """).tag(config=True) - - @default('command') - def _command_default(self): -- return self.inkscape + \ -- ' --without-gui --export-pdf="{to_filename}" "{from_filename}"' -- -+ major_verison = self.inkscape_version.split('.')[0] -+ export_option = ' --export-filename' if int(major_verison) > 0 else ' --export-pdf' -+ gui_option = '' if int(major_verison) > 0 else ' --without-gui' -+ -+ return '{inkscape}{gui_option}{export_option}='.format( -+ inkscape=self.inkscape, export_option=export_option, gui_option=gui_option -+ ) + '"{to_filename}" "{from_filename}"' -+ - inkscape = Unicode(help="The path to Inkscape, if necessary").tag(config=True) - @default('inkscape') - def _inkscape_default(self): -- if get_inkscape_path is not None: -- return get_inkscape_path -+ inkscape_path = which('inkscape') -+ if inkscape_path is not None: -+ return inkscape_path - if sys.platform == "darwin": - if os.path.isfile(INKSCAPE_APP): - return INKSCAPE_APP -@@ -85,22 +104,22 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor): - Convert a single SVG figure to PDF. Returns converted data. - """ - -- #Work in a temporary directory -+ # Work in a temporary directory - with TemporaryDirectory() as tmpdir: -- -- #Write fig to temp file -+ -+ # Write fig to temp file - input_filename = os.path.join(tmpdir, 'figure.svg') - # SVG data is unicode text - with io.open(input_filename, 'w', encoding='utf8') as f: - f.write(cast_unicode_py2(data)) - -- #Call conversion application -+ # Call conversion application - output_filename = os.path.join(tmpdir, 'figure.pdf') -- shell = self.command.format(from_filename=input_filename, -+ shell = self.command.format(from_filename=input_filename, - to_filename=output_filename) -- subprocess.call(shell, shell=True) #Shell=True okay since input is trusted. -+ subprocess.call(shell, shell=True) # Shell=True okay since input is trusted. - -- #Read output from drive -+ # Read output from drive - # return value expects a filename - if os.path.isfile(output_filename): - with open(output_filename, 'rb') as f: -diff --git a/nbconvert/preprocessors/tests/test_svg2pdf.py b/nbconvert/preprocessors/tests/test_svg2pdf.py -index c42222c7..d9ccec8c 100644 ---- a/nbconvert/preprocessors/tests/test_svg2pdf.py -+++ b/nbconvert/preprocessors/tests/test_svg2pdf.py -@@ -4,6 +4,7 @@ - # Distributed under the terms of the Modified BSD License. - - from nbformat import v4 as nbformat -+from unittest.mock import patch, Mock - - from .base import PreprocessorTestsBase - from ..svg2pdf import SVG2PDFPreprocessor -@@ -51,9 +52,9 @@ class Testsvg2pdf(PreprocessorTestsBase): - return nbformat.new_notebook(cells=cells) - - -- def build_preprocessor(self): -+ def build_preprocessor(self, **kwargs): - """Make an instance of a preprocessor""" -- preprocessor = SVG2PDFPreprocessor() -+ preprocessor = SVG2PDFPreprocessor(**kwargs) - preprocessor.enabled = True - return preprocessor - -@@ -71,4 +72,23 @@ class Testsvg2pdf(PreprocessorTestsBase): - preprocessor = self.build_preprocessor() - nb, res = preprocessor(nb, res) - self.assertIn('application/pdf', nb.cells[0].outputs[0].data) -- -+ -+ @patch('subprocess.Popen') -+ def test_inkscape_version_default(self, mock_popen): -+ mock_popen().communicate.return_value = (b'Inkscape 0.92.3 (2405546, 2018-03-11)', b'') -+ mock_popen().returncode = 0 -+ -+ preprocessor = self.build_preprocessor() -+ self.assertEquals(preprocessor.inkscape_version, '0.92.3') -+ -+ def test_inkscape_pre_v1_command(self): -+ preprocessor = self.build_preprocessor(inkscape_version='0.92.3') -+ self.assertEquals(preprocessor.command, '0.92.3') -+ -+ def test_inkscape_pre_v1_command(self): -+ preprocessor = self.build_preprocessor(inkscape='fake-inkscape', inkscape_version='0.92.3') -+ self.assertEquals(preprocessor.command, 'fake-inkscape --without-gui --export-pdf="{to_filename}" "{from_filename}"') -+ -+ def test_inkscape_v1_command(self): -+ preprocessor = self.build_preprocessor(inkscape='fake-inkscape', inkscape_version='1.0beta2') -+ self.assertEquals(preprocessor.command, 'fake-inkscape --export-filename="{to_filename}" "{from_filename}"') diff --git a/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch b/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch deleted file mode 100644 index 822c32753f83..000000000000 --- a/dev-python/nbconvert/files/nbconvert-5.6.1-py39.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/nbconvert/filters/strings.py b/nbconvert/filters/strings.py -index 2673d661..9ae82a13 100755 ---- a/nbconvert/filters/strings.py -+++ b/nbconvert/filters/strings.py -@@ -19,8 +19,8 @@ except ImportError: - from urllib2 import quote # Py 2 - - # defusedxml does safe(r) parsing of untrusted XML data --from defusedxml import cElementTree as ElementTree --from xml.etree.cElementTree import Element -+from defusedxml import ElementTree -+from xml.etree.ElementTree import Element - - from ipython_genutils import py3compat - -diff --git a/nbconvert/preprocessors/svg2pdf.py b/nbconvert/preprocessors/svg2pdf.py -index aff14d9f..b689b1bc 100644 ---- a/nbconvert/preprocessors/svg2pdf.py -+++ b/nbconvert/preprocessors/svg2pdf.py -@@ -105,6 +105,6 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor): - if os.path.isfile(output_filename): - with open(output_filename, 'rb') as f: - # PDF is a nb supported binary, data type, so base64 encode. -- return base64.encodestring(f.read()) -+ return base64.encodebytes(f.read()) - else: - raise TypeError("Inkscape svg to pdf conversion failed") diff --git a/dev-python/nbconvert/nbconvert-5.6.1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1.ebuild deleted file mode 100644 index 3efa859bc6be..000000000000 --- a/dev-python/nbconvert/nbconvert-5.6.1.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) - -inherit distutils-r1 - -DESCRIPTION="Converting Jupyter Notebooks" -HOMEPAGE="https://nbconvert.readthedocs.io/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="test" - -RDEPEND=" - dev-python/bleach[${PYTHON_USEDEP}] - dev-python/defusedxml[${PYTHON_USEDEP}] - >=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/jupyter_core[${PYTHON_USEDEP}] - >=dev-python/mistune-0.7.4[${PYTHON_USEDEP}] - dev-python/nbformat[${PYTHON_USEDEP}] - >=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}] - dev-python/pygments[${PYTHON_USEDEP}] - >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}] - dev-python/testpath[${PYTHON_USEDEP}] - www-servers/tornado[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/pebble[${PYTHON_USEDEP}] - dev-python/ipykernel[${PYTHON_USEDEP}] - dev-python/ipywidgets[${PYTHON_USEDEP}] - >=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}] - media-gfx/inkscape - ) -" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${P}-inkscape-1.patch - "${FILESDIR}"/${P}-py39.patch -) - -src_prepare() { - # assumes old inkscape output? - sed -i -e '/SVG\.ipynb/d' \ - nbconvert/preprocessors/tests/test_execute.py || die - - distutils-r1_src_prepare -} - -python_test() { - distutils_install_for_testing bdist_egg - cd "${TEST_DIR}"/lib || die - pytest -vv --pyargs nbconvert || die -} - -pkg_postinst() { - if ! has_version app-text/pandoc ; then - einfo "Pandoc is required for converting to formats other than Python," - einfo "HTML, and Markdown. If you need this functionality, install" - einfo "app-text/pandoc." - fi -} -- cgit v1.2.3