diff --git a/CHANGELOG.md b/CHANGELOG.md index f5ee9d0f0..1f611321a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,22 @@ +## 4.0.1 + +([Full Changelog](https://github.com/jupyter/nbdime/compare/4.0.0...89548a7f688c31d86138371eb610c74e4810486a)) + +### Bugs fixed + +- Fix version parsing [#739](https://github.com/jupyter/nbdime/pull/739) ([@fcollonval](https://github.com/fcollonval)) + +### Contributors to this release + +([GitHub contributors page for this release](https://github.com/jupyter/nbdime/graphs/contributors?from=2023-11-20&to=2023-11-21&type=c)) + +[@fcollonval](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Afcollonval+updated%3A2023-11-20..2023-11-21&type=Issues) + + + ## 4.0.0 ([Full Changelog](https://github.com/jupyter/nbdime/compare/3.2.1...d02956e0e24a0e00160ca912f90261858528a39b)) @@ -67,8 +83,6 @@ [@agoose77](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Aagoose77+updated%3A2023-04-30..2023-11-20&type=Issues) | [@dependabot](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Adependabot+updated%3A2023-04-30..2023-11-20&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Afcollonval+updated%3A2023-04-30..2023-11-20&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Agithub-actions+updated%3A2023-04-30..2023-11-20&type=Issues) | [@HaudinFlorence](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3AHaudinFlorence+updated%3A2023-04-30..2023-11-20&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Ajtpio+updated%3A2023-04-30..2023-11-20&type=Issues) | [@krassowski](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Akrassowski+updated%3A2023-04-30..2023-11-20&type=Issues) | [@minrk](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Aminrk+updated%3A2023-04-30..2023-11-20&type=Issues) | [@SylvainCorlay](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3ASylvainCorlay+updated%3A2023-04-30..2023-11-20&type=Issues) | [@vidartf](https://github.com/search?q=repo%3Ajupyter%2Fnbdime+involves%3Avidartf+updated%3A2023-04-30..2023-11-20&type=Issues) - - ## 4.0.0rc1 ([Full Changelog](https://github.com/jupyter/nbdime/compare/nbdime-jupyterlab@3.0.0-rc.1...d02956e0e24a0e00160ca912f90261858528a39b)) diff --git a/nbdime/_version.py b/nbdime/_version.py index 258de98f0..6fb277cb0 100644 --- a/nbdime/_version.py +++ b/nbdime/_version.py @@ -8,7 +8,7 @@ _specifier_ = {"a": "alpha", "b": "beta", "rc": "candidate", "": "final"} -__version__ = "4.0.0" +__version__ = "4.0.1" parser = re.compile( r"^(?P\d+)\.(?P\d+)\.(?P\d+)((?P[A-z]+)(?P\d+))?$" diff --git a/package-lock.json b/package-lock.json index f15df3230..db39e6cc0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22322,7 +22322,7 @@ }, "packages/labextension": { "name": "nbdime-jupyterlab", - "version": "3.0.0", + "version": "3.0.1", "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" + "nbdime": "^7.0.1" }, "devDependencies": { "@jupyterlab/application": "^4.0.0", @@ -22367,7 +22367,7 @@ } }, "packages/nbdime": { - "version": "7.0.0", + "version": "7.0.1", "license": "BSD-3-Clause", "dependencies": { "@codemirror/lang-markdown": "^6.1.1", @@ -22417,7 +22417,7 @@ }, "packages/webapp": { "name": "nbdime-webapp", - "version": "4.0.0", + "version": "4.0.1", "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" + "nbdime": "^7.0.1" }, "devDependencies": { "@types/file-saver": "^2.0.0", diff --git a/packages/labextension/package.json b/packages/labextension/package.json index f245ab8d4..6858c15d7 100644 --- a/packages/labextension/package.json +++ b/packages/labextension/package.json @@ -1,6 +1,6 @@ { "name": "nbdime-jupyterlab", - "version": "3.0.0", + "version": "3.0.1", "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" + "nbdime": "^7.0.1" }, "devDependencies": { "@jupyterlab/application": "^4.0.0", diff --git a/packages/nbdime/package.json b/packages/nbdime/package.json index fda49c75f..521e146c9 100644 --- a/packages/nbdime/package.json +++ b/packages/nbdime/package.json @@ -1,6 +1,6 @@ { "name": "nbdime", - "version": "7.0.0", + "version": "7.0.1", "description": "Diff and merge of Jupyter Notebooks", "repository": { "type": "git", diff --git a/packages/webapp/package.json b/packages/webapp/package.json index cd43068c7..437341f2a 100644 --- a/packages/webapp/package.json +++ b/packages/webapp/package.json @@ -1,6 +1,6 @@ { "name": "nbdime-webapp", - "version": "4.0.0", + "version": "4.0.1", "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" + "nbdime": "^7.0.1" }, "devDependencies": { "@types/file-saver": "^2.0.0",