Skip to content

Commit

Permalink
Publish 4.0.0rc0
Browse files Browse the repository at this point in the history
SHA256 hashes:

nbdime-4.0.0rc0-py3-none-any.whl: 15d2f37a0275bb7284d98d5fabfeb3a79645a4c0fdf16aa06e1ad626f2cbc579

nbdime-4.0.0rc0.tar.gz: d8ff847e848ee38fac85cbe0b3488a6304a212ad525b3613c970743aa4a2fddf

nbdime-7.0.0-rc.1.tgz: 15e0bf00b42083a848bf2e8431266dcb4f0ef60a6017a4c7d8ffcad817502c96

nbdime-jupyterlab-3.0.0-rc.1.tgz: 13e4b2c5300b88e282a09191b43597ea1184f2e70a91ceadbfee152f1cb0d2e2
  • Loading branch information
fcollonval committed Nov 6, 2023
1 parent 4349d94 commit 554c2d3
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 11 deletions.
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,42 @@

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

## 4.0.0rc0

([Full Changelog](https://github.com/jupyter/nbdime/compare/4.0.0a1...4349d9477f2dba374bca7355779c94071431b64b))

### Enhancements made

- Add translation for the frontend in Lab [#709](https://github.com/jupyter/nbdime/pull/709) ([@fcollonval](https://github.com/fcollonval))
- Add support for using cell ID in diffing and merging [#639](https://github.com/jupyter/nbdime/pull/639) ([@vidartf](https://github.com/vidartf))

### Bugs fixed

- CM6: Fix spacing between editors [#728](https://github.com/jupyter/nbdime/pull/728) ([@HaudinFlorence](https://github.com/HaudinFlorence))
- Fix drag and drop [#723](https://github.com/jupyter/nbdime/pull/723) ([@fcollonval](https://github.com/fcollonval))
- Do not collapse editor lines in single editor [#719](https://github.com/jupyter/nbdime/pull/719) ([@fcollonval](https://github.com/fcollonval))
- Improve alignment [#717](https://github.com/jupyter/nbdime/pull/717) ([@fcollonval](https://github.com/fcollonval))
- Add CSS files in nbdime package [#715](https://github.com/jupyter/nbdime/pull/715) ([@fcollonval](https://github.com/fcollonval))

### Maintenance and upkeep improvements

- Bump JS packages to rc.0 [#730](https://github.com/jupyter/nbdime/pull/730) ([@fcollonval](https://github.com/fcollonval))
- Bump @babel/traverse from 7.22.5 to 7.23.2 [#713](https://github.com/jupyter/nbdime/pull/713) ([@dependabot](https://github.com/dependabot))
- Set up releaser [#710](https://github.com/jupyter/nbdime/pull/710) ([@fcollonval](https://github.com/fcollonval))

### Documentation improvements

- Update test badge [#725](https://github.com/jupyter/nbdime/pull/725) ([@fcollonval](https://github.com/fcollonval))
- Bump version [#712](https://github.com/jupyter/nbdime/pull/712) ([@fcollonval](https://github.com/fcollonval))

### Other merged PRs

- Fix editor background color [#714](https://github.com/jupyter/nbdime/pull/714) ([@HaudinFlorence](https://github.com/HaudinFlorence))

### Contributors to this release

([GitHub contributors page for this release](https://github.com/jupyter/nbdime/graphs/contributors?from=2023-10-16&to=2023-11-06&type=c))

[@dependabot](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Adependabot+updated%3A2023-10-16..2023-11-06&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Afcollonval+updated%3A2023-10-16..2023-11-06&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Agithub-actions+updated%3A2023-10-16..2023-11-06&type=Issues) | [@HaudinFlorence](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3AHaudinFlorence+updated%3A2023-10-16..2023-11-06&type=Issues) | [@krassowski](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Akrassowski+updated%3A2023-10-16..2023-11-06&type=Issues) | [@vidartf](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Avidartf+updated%3A2023-10-16..2023-11-06&type=Issues)

<!-- <END NEW CHANGELOG ENTRY> -->
2 changes: 1 addition & 1 deletion nbdime/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

_specifier_ = {"a": "alpha", "b": "beta", "rc": "candidate", "": "final"}

__version__ = "4.0.0a1"
__version__ = "4.0.0rc0"

parser = re.compile(r"^(?P<major>\d+)\.(?P<minor>\d+)\.(?P<micro>\d+)((?P<releaselevel>a|b|rc)(?P<serial>\d+))?$")

Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/labextension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nbdime-jupyterlab",
"version": "3.0.0-rc.0",
"version": "3.0.0-rc.1",
"description": "A JupyterLab extension for showing Notebook diffs.",
"keywords": [
"jupyter",
Expand Down Expand Up @@ -58,7 +58,7 @@
"@lumino/coreutils": "^2.1.2",
"@lumino/disposable": "^2.1.2",
"@lumino/widgets": "^2.3.0",
"nbdime": "^7.0.0-rc.0"
"nbdime": "^7.0.0-rc.1"
},
"devDependencies": {
"@jupyterlab/application": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/nbdime/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nbdime",
"version": "7.0.0-rc.0",
"version": "7.0.0-rc.1",
"description": "Diff and merge of Jupyter Notebooks",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions packages/webapp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nbdime-webapp",
"version": "4.0.0-rc.0",
"version": "4.0.0-rc.1",
"private": true,
"license": "BSD-3-Clause",
"main": "static/nbdime.js",
Expand All @@ -27,7 +27,7 @@
"@lumino/widgets": "^2.0.0",
"alertify.js": "^1.0.12",
"file-saver": "^2.0.1",
"nbdime": "^7.0.0-rc.0"
"nbdime": "^7.0.0-rc.1"
},
"devDependencies": {
"@types/file-saver": "^2.0.0",
Expand Down

0 comments on commit 554c2d3

Please sign in to comment.