Skip to content

Commit df9bd91

Browse files
committed
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
1 parent d02956e commit df9bd91

File tree

6 files changed

+37
-13
lines changed

6 files changed

+37
-13
lines changed

CHANGELOG.md

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,32 @@
22

33
<!-- <START NEW CHANGELOG ENTRY> -->
44

5+
## 4.0.0rc1
6+
7+
([Full Changelog](https://github.com/jupyter/nbdime/compare/nbdime-jupyterlab@3.0.0-rc.1...d02956e0e24a0e00160ca912f90261858528a39b))
8+
9+
### Enhancements made
10+
11+
- Change header for unchanged notebook meta [#736](https://github.com/jupyter/nbdime/pull/736) ([@vidartf](https://github.com/vidartf))
12+
- Ensure collapsed mergepane border [#731](https://github.com/jupyter/nbdime/pull/731) ([@vidartf](https://github.com/vidartf))
13+
14+
### Bugs fixed
15+
16+
- Fix duplicate pickers [#735](https://github.com/jupyter/nbdime/pull/735) ([@vidartf](https://github.com/vidartf))
17+
18+
### Maintenance and upkeep improvements
19+
20+
- Test the releaser fix for tag format [#737](https://github.com/jupyter/nbdime/pull/737) ([@fcollonval](https://github.com/fcollonval))
21+
- Bump axios from 1.5.1 to 1.6.1 [#734](https://github.com/jupyter/nbdime/pull/734) ([@dependabot](https://github.com/dependabot))
22+
23+
### Contributors to this release
24+
25+
([GitHub contributors page for this release](https://github.com/jupyter/nbdime/graphs/contributors?from=2023-11-06&to=2023-11-20&type=c))
26+
27+
[@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)
28+
29+
<!-- <END NEW CHANGELOG ENTRY> -->
30+
531
## 4.0.0rc0
632

733
([Full Changelog](https://github.com/jupyter/nbdime/compare/4.0.0a1...4349d9477f2dba374bca7355779c94071431b64b))
@@ -39,5 +65,3 @@
3965
([GitHub contributors page for this release](https://github.com/jupyter/nbdime/graphs/contributors?from=2023-10-16&to=2023-11-06&type=c))
4066

4167
[@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)
42-
43-
<!-- <END NEW CHANGELOG ENTRY> -->

nbdime/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
_specifier_ = {"a": "alpha", "b": "beta", "rc": "candidate", "": "final"}
1010

11-
__version__ = "4.0.0rc0"
11+
__version__ = "4.0.0rc1"
1212

1313
parser = re.compile(r"^(?P<major>\d+)\.(?P<minor>\d+)\.(?P<micro>\d+)((?P<releaselevel>a|b|rc)(?P<serial>\d+))?$")
1414

package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/labextension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nbdime-jupyterlab",
3-
"version": "3.0.0-rc.1",
3+
"version": "3.0.0-rc.2",
44
"description": "A JupyterLab extension for showing Notebook diffs.",
55
"keywords": [
66
"jupyter",
@@ -58,7 +58,7 @@
5858
"@lumino/coreutils": "^2.1.2",
5959
"@lumino/disposable": "^2.1.2",
6060
"@lumino/widgets": "^2.3.0",
61-
"nbdime": "^7.0.0-rc.1"
61+
"nbdime": "^7.0.0-rc.2"
6262
},
6363
"devDependencies": {
6464
"@jupyterlab/application": "^4.0.0",

packages/nbdime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nbdime",
3-
"version": "7.0.0-rc.1",
3+
"version": "7.0.0-rc.2",
44
"description": "Diff and merge of Jupyter Notebooks",
55
"repository": {
66
"type": "git",

packages/webapp/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nbdime-webapp",
3-
"version": "4.0.0-rc.1",
3+
"version": "4.0.0-rc.2",
44
"private": true,
55
"license": "BSD-3-Clause",
66
"main": "static/nbdime.js",
@@ -27,7 +27,7 @@
2727
"@lumino/widgets": "^2.0.0",
2828
"alertify.js": "^1.0.12",
2929
"file-saver": "^2.0.1",
30-
"nbdime": "^7.0.0-rc.1"
30+
"nbdime": "^7.0.0-rc.2"
3131
},
3232
"devDependencies": {
3333
"@types/file-saver": "^2.0.0",

0 commit comments

Comments
 (0)