Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Downgrade requirements + renames #42

Merged
merged 6 commits into from
Nov 20, 2022
Merged

Downgrade requirements + renames #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1910874
Update pyproject.toml
amorgun Nov 20, 2022
78ae860
Rename inject.py to compare.py
amorgun Nov 20, 2022
3931f22
Rename inject_split.html to template.html
amorgun Nov 20, 2022
ff21ff7
Update sw_cellmagic.py
amorgun Nov 20, 2022
8037be4
Update compare.py
amorgun Nov 20, 2022
64af9fc
Update __init__.py
amorgun Nov 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jupyter_compare_view/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion jupyter_compare_view/inject.py → jupyter_compare_view/compare.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions jupyter_compare_view/sw_cellmagic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
self.shell.run_cell(complete_cell)
0 jupyter_compare_view/inject_split.html → jupyter_compare_view/template.html
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
[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"
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" }
Expand Down