Publish 4.0.0rc1

SHA256 hashes: nbdime-4.0.0rc1-py3-none-any.whl: 98fe80517c5a66f8be5791290a44e8a00ea0bdb106b7fb7e34c115a65fd4f5dd nbdime-4.0.0rc1.tar.gz: bf2cac05bed514ccd81ca186888ee45b5e131ecb0e2d5945227ab7de04d021dd nbdime-7.0.0-rc.2.tgz: 0409001acc9f9ec1261284f2435b01e07152c2f2d184772b5e134dc708f40e9c nbdime-jupyterlab-3.0.0-rc.2.tgz: fdf6a9b9fccadb8699ffc9086459e59e4657d30e44a7c91a69f6c6c186e269a3
jupyter · Nov 20, 2023 · df9bd91 · df9bd91
1 parent d02956e
commit df9bd91
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,32 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 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)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 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)
-
-<!-- <END NEW CHANGELOG ENTRY> -->
diff --git 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<major>\d+)\.(?P<minor>\d+)\.(?P<micro>\d+)((?P<releaselevel>a|b|rc)(?P<serial>\d+))?$")
 

diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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",