diff --git a/python-metakernel-attr-error.patch b/python-metakernel-attr-error.patch new file mode 100644 index 0000000..d65c2f7 --- /dev/null +++ b/python-metakernel-attr-error.patch @@ -0,0 +1,29 @@ +From 10de9ecbd5554874be740fbee828d3e6e49b3047 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Fri, 6 Nov 2020 22:38:14 +0100 +Subject: [PATCH] Support older jedi versions + +--- + metakernel/magics/python_magic.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/metakernel/magics/python_magic.py b/metakernel/magics/python_magic.py +index 9279b32..b75a7b1 100644 +--- a/metakernel/magics/python_magic.py ++++ b/metakernel/magics/python_magic.py +@@ -173,7 +173,11 @@ class PythonMagic(Magic): + path, dot, like = completion_parts(path) + before = text[:len(text) - len(like)] + +- completions = interpreter.complete() ++ try: ++ completions = interpreter.complete() ++ except AttributeError: ++ completions = interpreter.completions() ++ + completions = [before + c.name_with_symbols for c in completions] + + self.kernel.log.error(completions) +-- +2.28.0 + diff --git a/python-metakernel-backslash.patch b/python-metakernel-backslash.patch new file mode 100644 index 0000000..fd60380 --- /dev/null +++ b/python-metakernel-backslash.patch @@ -0,0 +1,43 @@ +From 4573c5081ae3eb19c1669d206e9b644bb72edc5d Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Sat, 7 Nov 2020 10:16:14 +0100 +Subject: [PATCH] Escape backslashes in strings + +--- + metakernel/tests/test_parser.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/metakernel/tests/test_parser.py b/metakernel/tests/test_parser.py +index 360544d..923b6bc 100644 +--- a/metakernel/tests/test_parser.py ++++ b/metakernel/tests/test_parser.py +@@ -71,7 +71,7 @@ def get_parser(): + def test_complete1(): + p = get_parser() + info = p.parse_code('/tmp/') +- assert "Test\ Dir/" in info['path_matches'], info['path_matches'] ++ assert "Test\\ Dir/" in info['path_matches'], info['path_matches'] + + + def test_complete2(): +@@ -101,7 +101,7 @@ def test_complete5(): + def test_complete6(): + p = get_parser() + info = p.parse_code('/tmp/Test') +- assert "Test\ Dir/" in info['path_matches'], info['path_matches'] ++ assert "Test\\ Dir/" in info['path_matches'], info['path_matches'] + + + def test_complete7(): +@@ -113,7 +113,7 @@ def test_complete7(): + def test_complete8(): + p = get_parser() + info = p.parse_code('/tmp/Test Dir/', 0, 9) +- assert 'Test\ Dir/' in info['path_matches'], info ++ assert 'Test\\ Dir/' in info['path_matches'], info + + + def test_complete9(): +-- +2.28.0 + diff --git a/python-metakernel-latex.patch b/python-metakernel-latex.patch new file mode 100644 index 0000000..203f4d5 --- /dev/null +++ b/python-metakernel-latex.patch @@ -0,0 +1,87 @@ +From 994241d1dc04189bb33688fb7e2fe7443641d1b3 Mon Sep 17 00:00:00 2001 +From: Mattias Ellert +Date: Sat, 7 Nov 2020 10:14:50 +0100 +Subject: [PATCH] Add missing dollar signs to %latex examples and tests + +--- + metakernel/magics/README.md | 6 +++--- + metakernel/magics/latex_magic.py | 6 +++--- + metakernel/magics/tests/test_latex_magic.py | 6 +++--- + 3 files changed, 9 insertions(+), 9 deletions(-) + +diff --git a/metakernel/magics/README.md b/metakernel/magics/README.md +index 70d4e17..ea39b03 100644 +--- a/metakernel/magics/README.md ++++ b/metakernel/magics/README.md +@@ -218,7 +218,7 @@ Options: + This line magic will display the TEXT on the line as LaTeX. + + Example: +- %latex x_1 = \dfrac{a}{b} ++ %latex $x_1 = \dfrac{a}{b}$ + + ## `%load` + +@@ -657,9 +657,9 @@ This cell magic will display the TEXT in the cell as LaTeX. + + Example: + %%latex +- x_1 = \dfrac{a}{b} ++ $x_1 = \dfrac{a}{b}$ + +- x_2 = a^{n - 1} ++ $x_2 = a^{n - 1}$ + + ## `%%macro` + +diff --git a/metakernel/magics/latex_magic.py b/metakernel/magics/latex_magic.py +index 5958b84..ebad6d3 100644 +--- a/metakernel/magics/latex_magic.py ++++ b/metakernel/magics/latex_magic.py +@@ -13,7 +13,7 @@ class LatexMagic(Magic): + This line magic will display the TEXT on the line as LaTeX. + + Example: +- %latex x_1 = \dfrac{a}{b} ++ %latex $x_1 = \dfrac{a}{b}$ + + """ + latex = Latex(text) +@@ -27,9 +27,9 @@ class LatexMagic(Magic): + + Example: + %%latex +- x_1 = \dfrac{a}{b} ++ $x_1 = \dfrac{a}{b}$ + +- x_2 = a^{n - 1} ++ $x_2 = a^{n - 1}$ + """ + latex = Latex(self.code) + self.kernel.Display(latex) +diff --git a/metakernel/magics/tests/test_latex_magic.py b/metakernel/magics/tests/test_latex_magic.py +index 5c00f5a..8fa9fdd 100644 +--- a/metakernel/magics/tests/test_latex_magic.py ++++ b/metakernel/magics/tests/test_latex_magic.py +@@ -5,15 +5,15 @@ from metakernel.tests.utils import (get_kernel, get_log_text, + + def test_latex_magic(): + kernel = get_kernel() +- kernel.do_execute("%latex x_1 = \dfrace{a}{b}") ++ kernel.do_execute("%latex $x_1 = \\dfrac{a}{b}$") + text = get_log_text(kernel) + assert "Display Data" in text + + clear_log_text(kernel) + + kernel.do_execute("""%%latex +- x_1 = \dfrac{a}{b} ++ $x_1 = \\dfrac{a}{b}$ + +- x_2 = a^{n - 1}""") ++ $x_2 = a^{n - 1}$""") + text = get_log_text(kernel) + assert "Display Data" in text +-- +2.28.0 + diff --git a/python-metakernel.spec b/python-metakernel.spec index 972880e..aca301d 100644 --- a/python-metakernel.spec +++ b/python-metakernel.spec @@ -3,7 +3,7 @@ Name: python-metakernel # and release numbers - update below in each package section # Running rpmdev-bumpspec on this specfile will update all the # release tags automatically -Version: 0.27.3 +Version: 0.27.4 Release: 1%{?dist} %global pkgversion %{version} %global pkgrelease %{release} @@ -12,6 +12,15 @@ Summary: Metakernel for Jupyter License: BSD URL: https://github.com/Calysto/metakernel Source0: https://github.com/Calysto/metakernel/archive/%{version}/%{name}-%{version}.tar.gz +# Support older jedi versions (Fedora <= 32) +# https://github.com/Calysto/metakernel/pull/224 +Patch0: %{name}-attr-error.patch +# Add missing dollar signs to %latex examples and tests +# https://github.com/Calysto/metakernel/pull/225 +Patch1: %{name}-latex.patch +# Escape backslashes in strings in test code +# https://github.com/Calysto/metakernel/pull/226 +Patch2: %{name}-backslash.patch BuildArch: noarch BuildRequires: python3-devel @@ -69,7 +78,7 @@ This package contains the documentation of python-metakernel. %package -n python3-metakernel-python Version: 0.19.1 -Release: 38%{?dist} +Release: 39%{?dist} Summary: A Python kernel for Jupyter/IPython %{?python_provide:%python_provide python3-metakernel-python} Requires: python3-metakernel = %{pkgversion}-%{pkgrelease} @@ -81,7 +90,7 @@ A Python kernel for Jupyter/IPython, based on MetaKernel. %package -n python3-metakernel-echo Version: 0.19.1 -Release: 38%{?dist} +Release: 39%{?dist} Summary: A simple echo kernel for Jupyter/IPython %{?python_provide:%python_provide python3-metakernel-echo} Requires: python3-metakernel = %{pkgversion}-%{pkgrelease} @@ -92,6 +101,9 @@ A simple echo kernel for Jupyter/IPython, based on MetaKernel. %prep %setup -q -n metakernel-%{pkgversion} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build %py3_build @@ -172,6 +184,12 @@ wait $pid %{_datadir}/jupyter/kernels/python3-metakernel-echo %changelog +* Sat Nov 07 2020 Mattias Ellert - 0.27.4-1 +- Update to version 0.27.4 +- Fix compatibility with older jedi versions broken in 0.27.3 +- Add missing dollar signs to %latex examples and tests +- Escape backslashes in strings in test code + * Fri Nov 06 2020 Mattias Ellert - 0.27.3-1 - Update to version 0.27.3 diff --git a/sources b/sources index 2a1dcfb..3d59fb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-metakernel-0.27.3.tar.gz) = 1555d6befda155bf263a5a64045e96e1b140feec17d3e341a73d9c6d67c02231015d179be4aeb192137a1b1dcbea3ba350ab48ee1358e1c5b8dec96528616a38 +SHA512 (python-metakernel-0.27.4.tar.gz) = 35da33c467fbb52fe4c564fb2c4013fbc3aba4c49d6eb310997de08ab038fb9412a1ca01838ec0fab3e318e452844770a30c91ebfa06236a03a35550e6002d98