diff --git a/CHANGELOG.md b/CHANGELOG.md index cbfed3de..305cceb0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,32 @@ +## 4.0.0rc1 + +([Full Changelog](https://github.com/jupyter/nbdime/compare/nbdime-jupyterlab@3.0.0-rc.1...d02956e0e24a0e00160ca912f90261858528a39b)) + +### Enhancements made + +- Change header for unchanged notebook meta [#736](https://github.com/jupyter/nbdime/pull/736) ([@vidartf](https://github.com/vidartf)) +- Ensure collapsed mergepane border [#731](https://github.com/jupyter/nbdime/pull/731) ([@vidartf](https://github.com/vidartf)) + +### Bugs fixed + +- Fix duplicate pickers [#735](https://github.com/jupyter/nbdime/pull/735) ([@vidartf](https://github.com/vidartf)) + +### Maintenance and upkeep improvements + +- Test the releaser fix for tag format [#737](https://github.com/jupyter/nbdime/pull/737) ([@fcollonval](https://github.com/fcollonval)) +- Bump axios from 1.5.1 to 1.6.1 [#734](https://github.com/jupyter/nbdime/pull/734) ([@dependabot](https://github.com/dependabot)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/jupyter/nbdime/graphs/contributors?from=2023-11-06&to=2023-11-20&type=c)) + +[@dependabot](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Adependabot+updated%3A2023-11-06..2023-11-20&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Afcollonval+updated%3A2023-11-06..2023-11-20&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Agithub-actions+updated%3A2023-11-06..2023-11-20&type=Issues) | [@vidartf](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Avidartf+updated%3A2023-11-06..2023-11-20&type=Issues) + + + ## 4.0.0rc0 ([Full Changelog](https://github.com/jupyter/nbdime/compare/4.0.0a1...4349d9477f2dba374bca7355779c94071431b64b)) @@ -39,5 +65,3 @@ ([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) - - diff --git a/nbdime/_version.py b/nbdime/_version.py index 60198467..a79db199 100644 --- a/nbdime/_version.py +++ b/nbdime/_version.py @@ -8,7 +8,7 @@ _specifier_ = {"a": "alpha", "b": "beta", "rc": "candidate", "": "final"} -__version__ = "4.0.0rc0" +__version__ = "4.0.0rc1" parser = re.compile(r"^(?P\d+)\.(?P\d+)\.(?P\d+)((?Pa|b|rc)(?P\d+))?$") diff --git a/package-lock.json b/package-lock.json index c826d37f..ddff9bbe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22322,7 +22322,7 @@ }, "packages/labextension": { "name": "nbdime-jupyterlab", - "version": "3.0.0-rc.1", + "version": "3.0.0-rc.2", "license": "BSD-3-Clause", "dependencies": { "@jupyterlab/apputils": "^4.0.0", @@ -22338,7 +22338,7 @@ "@lumino/coreutils": "^2.1.2", "@lumino/disposable": "^2.1.2", "@lumino/widgets": "^2.3.0", - "nbdime": "^7.0.0-rc.1" + "nbdime": "^7.0.0-rc.2" }, "devDependencies": { "@jupyterlab/application": "^4.0.0", @@ -22367,7 +22367,7 @@ } }, "packages/nbdime": { - "version": "7.0.0-rc.1", + "version": "7.0.0-rc.2", "license": "BSD-3-Clause", "dependencies": { "@codemirror/lang-markdown": "^6.1.1", @@ -22417,7 +22417,7 @@ }, "packages/webapp": { "name": "nbdime-webapp", - "version": "4.0.0-rc.1", + "version": "4.0.0-rc.2", "license": "BSD-3-Clause", "dependencies": { "@fortawesome/fontawesome-free": "^5.12.0", @@ -22435,7 +22435,7 @@ "@lumino/widgets": "^2.0.0", "alertify.js": "^1.0.12", "file-saver": "^2.0.1", - "nbdime": "^7.0.0-rc.1" + "nbdime": "^7.0.0-rc.2" }, "devDependencies": { "@types/file-saver": "^2.0.0", diff --git a/packages/labextension/package.json b/packages/labextension/package.json index 08a4fbb9..2a001657 100644 --- a/packages/labextension/package.json +++ b/packages/labextension/package.json @@ -1,6 +1,6 @@ { "name": "nbdime-jupyterlab", - "version": "3.0.0-rc.1", + "version": "3.0.0-rc.2", "description": "A JupyterLab extension for showing Notebook diffs.", "keywords": [ "jupyter", @@ -58,7 +58,7 @@ "@lumino/coreutils": "^2.1.2", "@lumino/disposable": "^2.1.2", "@lumino/widgets": "^2.3.0", - "nbdime": "^7.0.0-rc.1" + "nbdime": "^7.0.0-rc.2" }, "devDependencies": { "@jupyterlab/application": "^4.0.0", diff --git a/packages/nbdime/package.json b/packages/nbdime/package.json index 90520f3a..5040f774 100644 --- a/packages/nbdime/package.json +++ b/packages/nbdime/package.json @@ -1,6 +1,6 @@ { "name": "nbdime", - "version": "7.0.0-rc.1", + "version": "7.0.0-rc.2", "description": "Diff and merge of Jupyter Notebooks", "repository": { "type": "git", diff --git a/packages/webapp/package.json b/packages/webapp/package.json index 785d30ba..381cfdcf 100644 --- a/packages/webapp/package.json +++ b/packages/webapp/package.json @@ -1,6 +1,6 @@ { "name": "nbdime-webapp", - "version": "4.0.0-rc.1", + "version": "4.0.0-rc.2", "private": true, "license": "BSD-3-Clause", "main": "static/nbdime.js", @@ -27,7 +27,7 @@ "@lumino/widgets": "^2.0.0", "alertify.js": "^1.0.12", "file-saver": "^2.0.1", - "nbdime": "^7.0.0-rc.1" + "nbdime": "^7.0.0-rc.2" }, "devDependencies": { "@types/file-saver": "^2.0.0",