Publish 4.0.0

SHA256 hashes: nbdime-4.0.0-py3-none-any.whl: bf5a2fcebf05d0414741113bd8326598160247658086c3627264cff0e007964e nbdime-4.0.0.tar.gz: d7edb551f2f9317a00b22411d3c38374cc9e0089e5eea205153f659afb57f88a nbdime-7.0.0.tgz: abd50f227ea9c129c0a1fac6e1f0d6345075896fbbad311006429e9a31f2f398 nbdime-jupyterlab-3.0.0.tgz: 6ec43ef75fb8a65fca3e34b1678ff0203df6e240af06f0a8eeeb802cc2fede90
jupyter · Nov 20, 2023 · b573249 · b573249
1 parent df9bd91
commit b573249
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,73 @@
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 4.0.0
+
+([Full Changelog](https://github.com/jupyter/nbdime/compare/3.2.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))
+- Add translation for the frontend in Lab [#709](https://github.com/jupyter/nbdime/pull/709) ([@fcollonval](https://github.com/fcollonval))
+- Make collapseIdentical margin configurable [#707](https://github.com/jupyter/nbdime/pull/707) ([@fcollonval](https://github.com/fcollonval))
+- Support hiding base editor [#705](https://github.com/jupyter/nbdime/pull/705) ([@fcollonval](https://github.com/fcollonval))
+- Restore collapsers [#701](https://github.com/jupyter/nbdime/pull/701) ([@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
+
+- Fix duplicate pickers [#735](https://github.com/jupyter/nbdime/pull/735) ([@vidartf](https://github.com/vidartf))
+- 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))
+- Apply post-mortem review comments [#711](https://github.com/jupyter/nbdime/pull/711) ([@fcollonval](https://github.com/fcollonval))
+- Improve `findAlignedLines` [#706](https://github.com/jupyter/nbdime/pull/706) ([@fcollonval](https://github.com/fcollonval))
+- Improve diff view [#696](https://github.com/jupyter/nbdime/pull/696) ([@fcollonval](https://github.com/fcollonval))
+- Fix wrong picker marker (a typo during lab 4.0 migration) [#688](https://github.com/jupyter/nbdime/pull/688) ([@krassowski](https://github.com/krassowski))
+- Use pseudo-elements instead of border to preserve line height [#687](https://github.com/jupyter/nbdime/pull/687) ([@krassowski](https://github.com/krassowski))
+
+### 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))
+- 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))
+- Upgrade devdependencies and clean up the configuration [#708](https://github.com/jupyter/nbdime/pull/708) ([@fcollonval](https://github.com/fcollonval))
+- Don't trigger CI jobs twice [#704](https://github.com/jupyter/nbdime/pull/704) ([@fcollonval](https://github.com/fcollonval))
+- Bump postcss from 8.4.24 to 8.4.31 [#703](https://github.com/jupyter/nbdime/pull/703) ([@dependabot](https://github.com/dependabot))
+- Switch from hub to gh CLI [#702](https://github.com/jupyter/nbdime/pull/702) ([@fcollonval](https://github.com/fcollonval))
+- RTD: make sure nodejs is present [#698](https://github.com/jupyter/nbdime/pull/698) ([@minrk](https://github.com/minrk))
+- Add src for sourcemap [#692](https://github.com/jupyter/nbdime/pull/692) ([@fcollonval](https://github.com/fcollonval))
+- Chore: use jupyter packaging [#600](https://github.com/jupyter/nbdime/pull/600) ([@agoose77](https://github.com/agoose77))
+
+### 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))
+- Add `.readthedocs.yml` config file [#686](https://github.com/jupyter/nbdime/pull/686) ([@krassowski](https://github.com/krassowski))
+- Remove debug console.log [#684](https://github.com/jupyter/nbdime/pull/684) ([@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))
+- Fix pickers for empty chunks [#691](https://github.com/jupyter/nbdime/pull/691) ([@krassowski](https://github.com/krassowski))
+- Fix syntax highlighting issue in diffchunks. [#689](https://github.com/jupyter/nbdime/pull/689) ([@HaudinFlorence](https://github.com/HaudinFlorence))
+- Support JupyterLab 4.0, port to Lumino 2 [#673](https://github.com/jupyter/nbdime/pull/673) ([@HaudinFlorence](https://github.com/HaudinFlorence))
+- Bump semver from 5.7.1 to 5.7.2 [#671](https://github.com/jupyter/nbdime/pull/671) ([@dependabot](https://github.com/dependabot))
+- Update files with prettier formatting [#668](https://github.com/jupyter/nbdime/pull/668) ([@HaudinFlorence](https://github.com/HaudinFlorence))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyter/nbdime/graphs/contributors?from=2023-04-30&to=2023-11-20&type=c))
+
+[@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)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 4.0.0rc1
 
 ([Full Changelog](https://github.com/jupyter/nbdime/compare/nbdime-jupyterlab@3.0.0-rc.1...d02956e0e24a0e00160ca912f90261858528a39b))
@@ -26,8 +93,6 @@
 
 [@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))

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.0rc1"
+__version__ = "4.0.0"
 
 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.2",
+  "version": "3.0.0",
   "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.2"
+    "nbdime": "^7.0.0"
   },
   "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.2",
+  "version": "7.0.0",
   "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.2",
+  "version": "4.0.0",
   "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.2"
+    "nbdime": "^7.0.0"
   },
   "devDependencies": {
     "@types/file-saver": "^2.0.0",