3.0.0

docs/source/changelog.md

@@ -1,5 +1,13 @@
 # Changes in nbdime
 
+## 3.0
+
+###  3.0.0 - 2021-04
+
+- Added support for JupyterLab 3. This includes compatability with jupyter_server (notebook is still supported as well).
+- Basic functionality for working with cell ids introduced in notebook format spec 4.5. Full utilization of this for diffing/merging functionality is planned for a later release.
+- Fixed some issues with inline merging
+
 ## 2.0
 
 ###  2.1.0 - 2020-10

nbdime/_version.py

@@ -1,2 +1,2 @@
-version_info = (3, 0, 0, 'b1')
+version_info = (3, 0, 0)
 __version__ = ".".join(map(str, version_info))

packages/labextension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nbdime-jupyterlab",
-  "version": "2.1.0-beta.1",
+  "version": "2.1.0",
   "description": "A JupyterLab extension for showing Notebook diffs.",
   "keywords": [
     "jupyter",
@@ -53,7 +53,7 @@
     "@lumino/coreutils": "^1.3.0",
     "@lumino/disposable": "^1.1.2",
     "@lumino/widgets": "^1.6.0",
-    "nbdime": "^6.1.0-beta.1"
+    "nbdime": "^6.1.0"
   },
   "devDependencies": {
     "@jupyterlab/application": "^2 || ^3",

packages/nbdime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nbdime",
-  "version": "6.1.0-beta.1",
+  "version": "6.1.0",
   "description": "Diff and merge of Jupyter Notebooks",
   "repository": {
     "type": "git",

packages/webapp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nbdime-webapp",
-  "version": "4.2.0-beta.1",
+  "version": "4.2.0",
   "private": true,
   "license": "BSD-3-Clause",
   "main": "static/nbdime.js",
@@ -27,7 +27,7 @@
     "@lumino/widgets": "^1.6.0",
     "alertify.js": "^1.0.12",
     "file-saver": "^2.0.1",
-    "nbdime": "^6.1.0-beta.1"
+    "nbdime": "^6.1.0"
   },
   "devDependencies": {
     "@types/file-saver": "^2.0.0",