Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ jobs:

pip install build
python -m build
pip uninstall -y "jupyterlab_cell_diff" jupyterlab
pip uninstall -y "jupyterlab_diff" jupyterlab

- name: Upload extension packages
uses: actions/upload-artifact@v4
with:
name: extension-artifacts
path: dist/jupyterlab_cell_diff*
path: dist/jupyterlab_diff*
if-no-files-found: error

test_isolated:
Expand All @@ -74,7 +74,7 @@ jobs:
sudo rm -rf $(which node)
sudo rm -rf $(which node)

pip install "jupyterlab>=4.0.0,<5" jupyterlab_cell_diff*.whl
pip install "jupyterlab>=4.0.0,<5" jupyterlab_diff*.whl

jupyter labextension list
jupyter labextension list 2>&1 | grep -ie "jupyterlab-diff.*OK"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ jobs:
- name: Upload Distributions
uses: actions/upload-artifact@v4
with:
name: jupyterlab_cell_diff-releaser-dist-${{ github.run_number }}
name: jupyterlab_diff-releaser-dist-${{ github.run_number }}
path: .jupyter_releaser_checkout/dist
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ node_modules/
*.egg-info/
.ipynb_checkpoints
*.tsbuildinfo
jupyterlab_cell_diff/labextension
jupyterlab_diff/labextension
# Version file is handled by hatchling
jupyterlab_cell_diff/_version.py
jupyterlab_diff/_version.py

# Created by https://www.gitignore.io/api/python
# Edit at https://www.gitignore.io/?templates=python
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ node_modules
**/lib
**/package.json
!/package.json
jupyterlab_cell_diff
jupyterlab_diff
.venv
23 changes: 2 additions & 21 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,6 @@

<!-- <START NEW CHANGELOG ENTRY> -->

## 0.6.0

([Full Changelog](https://github.com/jupyter-ai-contrib/jupyterlab-diff/compare/v0.5.1...984e8ee6aba711b22b2ebc52c721d7901b82b48f))

### Enhancements made

- Unified cell and file diffs [#16](https://github.com/jupyter-ai-contrib/jupyterlab-diff/pull/16) ([@jtpio](https://github.com/jtpio))

### Maintenance and upkeep improvements

- Rename to `jupyterlab-diff` [#20](https://github.com/jupyter-ai-contrib/jupyterlab-diff/pull/20) ([@jtpio](https://github.com/jtpio))
- Add UI tests [#19](https://github.com/jupyter-ai-contrib/jupyterlab-diff/pull/19) ([@jtpio](https://github.com/jtpio))

### Contributors to this release

([GitHub contributors page for this release](https://github.com/jupyter-ai-contrib/jupyterlab-diff/graphs/contributors?from=2025-09-23&to=2025-10-23&type=c))

[@jtpio](https://github.com/search?q=repo%3Ajupyter-ai-contrib%2Fjupyterlab-diff+involves%3Ajtpio+updated%3A2025-09-23..2025-10-23&type=Issues) | [@Zsailer](https://github.com/search?q=repo%3Ajupyter-ai-contrib%2Fjupyterlab-diff+involves%3AZsailer+updated%3A2025-09-23..2025-10-23&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 0.5.1

([Full Changelog](https://github.com/jupyter-ai-contrib/jupyterlab-diff/compare/v0.5.0...04e46da359755617d98a10311c0604fd331c72cb))
Expand All @@ -41,6 +20,8 @@

[@jtpio](https://github.com/search?q=repo%3Ajupyter-ai-contrib%2Fjupyterlab-diff+involves%3Ajtpio+updated%3A2025-09-17..2025-09-23&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->

## 0.5.0

([Full Changelog](https://github.com/jupyter-ai-contrib/jupyterlab-diff/compare/v0.4.2...787f10383f9ce4eb2b6d781b57ddd808b859b14c))
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The `jlpm` command is JupyterLab's pinned version of

```bash
# Clone the repo to your local environment
# Change directory to the jupyterlab_cell_diff directory
# Change directory to the jupyterlab_diff directory
# Install package in development mode
pip install -e "."
# Link your development version of the extension with JupyterLab
Expand Down Expand Up @@ -40,7 +40,7 @@ jupyter lab build --minimize=False

```bash
# Server extension must be manually disabled in develop mode
pip uninstall jupyterlab_cell_diff
pip uninstall jupyterlab_diff
```

In development mode, you will also need to remove the symlink created by `jupyter labextension develop`
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ A JupyterLab extension for showing cell diffs with multiple diffing strategies.
### PyPI Installation

```bash
pip install jupyterlab_cell_diff
pip install jupyterlab_diff
```

### Development Installation
Expand Down Expand Up @@ -123,7 +123,7 @@ The extension provides two diff viewing strategies:
To remove the extension, execute:

```bash
pip uninstall jupyterlab_cell_diff
pip uninstall jupyterlab_diff
```

## Troubleshoot
Expand Down
2 changes: 1 addition & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Making a new release of jupyterlab_cell_diff
# Making a new release of jupyterlab_diff

The extension can be published to `PyPI` and `npm` manually or using the [Jupyter Releaser](https://github.com/jupyter-server/jupyter_releaser).

Expand Down
4 changes: 2 additions & 2 deletions install.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"packageManager": "python",
"packageName": "jupyterlab_cell_diff",
"uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_cell_diff"
"packageName": "jupyterlab_diff",
"uninstallInstructions": "Use your Python package manager (pip, conda, etc.) to uninstall the package jupyterlab_diff"
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# the package from a stable release or in editable mode: https://pip.pypa.io/en/stable/topics/local-project-installs/#editable-installs
import warnings

warnings.warn("Importing 'jupyterlab_cell_diff' outside a proper installation.")
warnings.warn("Importing 'jupyterlab_diff' outside a proper installation.")
__version__ = "dev"


Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jupyterlab-diff",
"version": "0.6.0",
"version": "0.5.1",
"description": "A JupyterLab Extension for showing cell (git) diffs.",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -39,7 +39,7 @@
"clean": "jlpm clean:lib",
"clean:lib": "rimraf lib tsconfig.tsbuildinfo",
"clean:lintcache": "rimraf .eslintcache .stylelintcache",
"clean:labextension": "rimraf jupyterlab_cell_diff/labextension jupyterlab_cell_diff/_version.py",
"clean:labextension": "rimraf jupyterlab_diff/labextension jupyterlab_diff/_version.py",
"clean:all": "jlpm clean:lib && jlpm clean:labextension && jlpm clean:lintcache",
"eslint": "jlpm eslint:check --fix",
"eslint:check": "eslint . --cache --ext .ts,.tsx",
Expand Down Expand Up @@ -114,12 +114,12 @@
"pip"
],
"base": {
"name": "jupyterlab_cell_diff"
"name": "jupyterlab_diff"
}
}
},
"extension": true,
"outputDir": "jupyterlab_cell_diff/labextension"
"outputDir": "jupyterlab_diff/labextension"
},
"eslintIgnore": [
"node_modules",
Expand Down
16 changes: 8 additions & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5", "hatch-nodejs-version>=0
build-backend = "hatchling.build"

[project]
name = "jupyterlab_cell_diff"
name = "jupyterlab_diff"
readme = "README.md"
license = { file = "LICENSE" }
requires-python = ">=3.9"
Expand Down Expand Up @@ -35,24 +35,24 @@ source = "nodejs"
fields = ["description", "authors", "urls", "keywords"]

[tool.hatch.build.targets.sdist]
artifacts = ["jupyterlab_cell_diff/labextension"]
artifacts = ["jupyterlab_diff/labextension"]
exclude = [".github", "binder"]

[tool.hatch.build.targets.wheel.shared-data]
"jupyterlab_cell_diff/labextension" = "share/jupyter/labextensions/jupyterlab-diff"
"jupyterlab_diff/labextension" = "share/jupyter/labextensions/jupyterlab-diff"
"install.json" = "share/jupyter/labextensions/jupyterlab-diff/install.json"

[tool.hatch.build.hooks.version]
path = "jupyterlab_cell_diff/_version.py"
path = "jupyterlab_diff/_version.py"

[tool.hatch.build.hooks.jupyter-builder]
dependencies = ["hatch-jupyter-builder>=0.5"]
build-function = "hatch_jupyter_builder.npm_builder"
ensured-targets = [
"jupyterlab_cell_diff/labextension/static/style.js",
"jupyterlab_cell_diff/labextension/package.json",
"jupyterlab_diff/labextension/static/style.js",
"jupyterlab_diff/labextension/package.json",
]
skip-if-exists = ["jupyterlab_cell_diff/labextension/static/style.js"]
skip-if-exists = ["jupyterlab_diff/labextension/static/style.js"]

[tool.hatch.build.hooks.jupyter-builder.build-kwargs]
build_cmd = "build:prod"
Expand All @@ -62,7 +62,7 @@ npm = ["jlpm"]
build_cmd = "install:extension"
npm = ["jlpm"]
source_dir = "src"
build_dir = "jupyterlab_cell_diff/labextension"
build_dir = "jupyterlab_diff/labextension"

[tool.jupyter-releaser.options]
version_cmd = "hatch version"
Expand Down
Loading