From 1910874213251acb1f52fa9965eace818911cc44 Mon Sep 17 00:00:00 2001 From: amorgun Date: Sun, 20 Nov 2022 11:38:53 +0300 Subject: [PATCH 1/6] Update pyproject.toml --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index a74786b..a45526e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "jupyter_compare_view" -version = "0.1.5" +version = "0.1.6" description = "Blend Between Multiple Images in JupyterLab." authors = ["Octoframes"] license = "MIT" @@ -8,11 +8,11 @@ readme = "README.md" include = ["vendor/compare_view/browser_compare_view.js"] [tool.poetry.dependencies] -python = ">=3.8,<3.11" +python = ">=3.7,<3.11" ipython = ">=6.0.0" ipykernel = ">=5.0.0" -Pillow = ">=9.1.0" -Jinja2 = ">=3.1.2" +Pillow = ">=7.1.2" +Jinja2 = ">=2.11.3" [tool.poetry.dev-dependencies] black = { extras = ["jupyter"], version = ">=22.3.0" } From 78ae860f0a0c314d1296df4e3b6a6d05b6c39dad Mon Sep 17 00:00:00 2001 From: amorgun Date: Sun, 20 Nov 2022 11:39:15 +0300 Subject: [PATCH 2/6] Rename inject.py to compare.py --- jupyter_compare_view/{inject.py => compare.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jupyter_compare_view/{inject.py => compare.py} (100%) diff --git a/jupyter_compare_view/inject.py b/jupyter_compare_view/compare.py similarity index 100% rename from jupyter_compare_view/inject.py rename to jupyter_compare_view/compare.py From 3931f228dcaa5669fc0980634a5b3848c194033a Mon Sep 17 00:00:00 2001 From: amorgun Date: Sun, 20 Nov 2022 11:39:37 +0300 Subject: [PATCH 3/6] Rename inject_split.html to template.html --- jupyter_compare_view/{inject_split.html => template.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jupyter_compare_view/{inject_split.html => template.html} (100%) diff --git a/jupyter_compare_view/inject_split.html b/jupyter_compare_view/template.html similarity index 100% rename from jupyter_compare_view/inject_split.html rename to jupyter_compare_view/template.html From ff21ff7d66e8c975a162a5569bf59fc784d419f1 Mon Sep 17 00:00:00 2001 From: amorgun Date: Sun, 20 Nov 2022 11:40:05 +0300 Subject: [PATCH 4/6] Update sw_cellmagic.py --- jupyter_compare_view/sw_cellmagic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jupyter_compare_view/sw_cellmagic.py b/jupyter_compare_view/sw_cellmagic.py index b7b8321..99f9e8c 100644 --- a/jupyter_compare_view/sw_cellmagic.py +++ b/jupyter_compare_view/sw_cellmagic.py @@ -6,7 +6,7 @@ from IPython.utils.capture import capture_output from PIL import Image -from .inject import inject_split +from .compare import inject_split @magics_class @@ -91,4 +91,4 @@ def splity(self, line, cell): # TODO: Delete this somewhere 10/2022. new_line = "%%compare" new_line += line complete_cell = new_line + "\n" + cell - self.shell.run_cell(complete_cell) \ No newline at end of file + self.shell.run_cell(complete_cell) From 8037be45e6e359a08b9f43064ecba133746a4eb5 Mon Sep 17 00:00:00 2001 From: amorgun Date: Sun, 20 Nov 2022 11:40:24 +0300 Subject: [PATCH 5/6] Update compare.py --- jupyter_compare_view/compare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyter_compare_view/compare.py b/jupyter_compare_view/compare.py index 4942be1..7446567 100644 --- a/jupyter_compare_view/compare.py +++ b/jupyter_compare_view/compare.py @@ -36,7 +36,7 @@ def inject_split(image_urls, height, config) -> None: config_parsed["controls_id"] = f"controls_{key}" config_parsed["key"] = str(key) html_code = compile_template( - os.path.join((os.path.dirname(__file__)), "inject_split.html"), + os.path.join((os.path.dirname(__file__)), "template.html"), key=key, image_urls=image_urls, height=height, From 64af9fc72682ae88d62dd8e196208d001cc8fc62 Mon Sep 17 00:00:00 2001 From: amorgun Date: Sun, 20 Nov 2022 11:40:43 +0300 Subject: [PATCH 6/6] Update __init__.py --- jupyter_compare_view/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jupyter_compare_view/__init__.py b/jupyter_compare_view/__init__.py index 598ad7a..455d2ca 100644 --- a/jupyter_compare_view/__init__.py +++ b/jupyter_compare_view/__init__.py @@ -2,7 +2,7 @@ from IPython import get_ipython import pkg_resources -from .inject import inject_dependencies +from .compare import inject_dependencies __version__: str = pkg_resources.get_distribution(__name__).version