[pull] master from jupyter:master #9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
support Python 3.11
* Update typescript I am working on another pr which uses newer typescript features, so I thought I would update it first. This pr updates to typescript 4.9 and fixes the resulting errors. It also sets up a stricter tsconfig_base which is used by all tsconfig files and fixes the resulting errors. * add back funciton that maybe needed externally * fix test typescript errors * Cleanup TS upgrade Reverts parameter renames, and removes tsconfig settings with the default values. Removes as error expected directives, and fixes typings in another way. * Enforce explicit type-only imports This forces type-only imports to be imported with `import type` * CI py 3.6 -> 3.11 * Fix cookie secret * Remove notebook tests With jupyter_server 2.0, we cannot support launching with notebook. The tests can potentially be reenabled with notebook 7.0, as it is based on jupyter_server. * Add token auth fixture When there is a token, xsrf cookies/headers are ignored, so using it makes tests easier. Co-authored-by: Vidar Tonaas Fauske <510760+vidartf@users.noreply.github.com> Co-authored-by: Vidar Tonaas Fauske <vidartf@gmail.com>
Update cell marker format to use bold correctly
Jupyter server 2.0 compatability fixes
The latter is available with Python 3.3 [1], and nbdime requires Python 3.6+ as per setup.py. This change removes the need of an external library. [1] https://docs.python.org/3/library/unittest.mock.html
* `--openssl-legacy-provider`: webpack reports an error with OpenSSL 3 [1] as webpack uses md4, which is available only from the legacy provider. Newer webpack adds a wasm implementation of md4 [2], while nbdime uses very old webpack [3]. * Node.js 14.x: some dependencies (ex: @jupyter/ydoc) uses ES modules, which are declared as stable since Node.js 14.x [4] [1] webpack/webpack#14532 [2] webpack/webpack#14584 [3] https://github.com/jupyter/nbdime/blob/2da614b603b694e13fc8d597eef1cc09ff07cb10/packages/webapp/package.json#L44 [4] https://nodejs.org/docs/latest-v14.x/api/esm.html
Replace mock with unittest.mock
Adds support for notebook 6 by loudly failing if trying to load nbdime as an nb6 server extension if jupyter_server version >= 2.
node 18, webpack 5, etc.
Add notebook 6 server extension support (w/tests)
This will make package updates a more controlled exercise.
Seems like the patch is no longer needed?
Now borders are more similar to that of previous version, except double borders are avoided if possible.
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
Including fixing a broken style that used a private variable.
Ensure collapsed mergepane border
Bumps [axios](https://github.com/axios/axios) from 1.5.1 to 1.6.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.5.1...v1.6.1) --- updated-dependencies: - dependency-name: axios dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>
Bump axios from 1.5.1 to 1.6.1
* Update .prettierignore * prettier * Avoid duplicate gutter markers To avoid remote, local and merge diff views adding overlapping gutter markers of the same type on the same lin 8000 e. We leave it to CM to handle multiple markers of different types on the same line, but that shouldn't really apply for us. * Fix GutterMarker.eq for comparison Use simple identity comparison. * Update Playwright Snapshots * Update Playwright Snapshots * Adjust UI test expected picker numbers * Update Playwright Snapshots * Update Playwright Snapshots * Revert spurious snapshot update --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: krassowski <5832902+krassowski@users.noreply.github.com>
* Change header for unchanged notebook meta We previously changed to always showing the metadata diff in notebook merges, in case the user needs to make manual edits to it even if there are no changes in the merge itself. That change did not take into account that the display behavior here made some assumptions about only being shown when there was a change. Here we make the title conditional on whether there are changes or not, and make sure not to collapse similar changes in the case where there are none. * Update Playwright Snapshots * Update Playwright Snapshots * Disable animations for metadata drawer expand * Update Playwright Snapshots * Update Playwright Snapshots * fix string for translation Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
* Test the releaser fix for tag format * Forgot that the version installed in hardcoded
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
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
* Fix version parsing * Avoid setting releaselevel to final as much as possible
SHA256 hashes: nbdime-4.0.1-py3-none-any.whl: 82538e2b52 6D47 e0834e9c07607e2dea27aceaaf7e8cf2269a4607c67ea9aa625404 nbdime-4.0.1.tar.gz: f1a760c0b00c1ba9b4945c16ce92577f393fb51d184f351b7685ba6e8502098e nbdime-7.0.1.tgz: 74674a8ad7ac854d037b875b50bd714eea8644b40bd5a12546ebdb35dff2f6ee nbdime-jupyterlab-3.0.1.tgz: 64bc1a8d72e4320c16cc2b1626278f81d9af6cb0dce0b137e43b24fedf5f9df1
* Allow unauthenticated access to jupyter server * Add a warning about using unsecured server * Grammar Co-authored-by: David Brochart <david.brochart@gmail.com> --------- Co-authored-by: David Brochart <david.brochart@gmail.com>
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.6. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.15.3...v1.15.6) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [webpack](https://github.com/webpack/webpack) from 5.86.0 to 5.94.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v5.86.0...v5.94.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [ejs](https://github.com/mde/ejs) from 3.1.9 to 3.1.10. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](mde/ejs@v3.1.9...v3.1.10) --- updated-dependencies: - dependency-name: ejs dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](micromatch/braces@3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [express](https://github.com/expressjs/express) and [verdaccio](https://github.com/verdaccio/verdaccio). These dependencies needed to be updated together. Updates `express` from 4.18.2 to 4.19.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.18.2...4.19.2) Updates `verdaccio` from 5.27.0 to 5.32.1 - [Release notes](https://github.com/verdaccio/verdaccio/releases) - [Changelog](https://github.com/verdaccio/verdaccio/blob/v5.32.1/CHANGELOG.md) - [Commits](verdaccio/verdaccio@v5.27.0...v5.32.1) --- updated-dependencies: - dependency-name: express dependency-type: indirect - dependency-name: verdaccio dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
SHA256 hashes: nbdime-4.0.2-py3-none-any.whl: e5a43aca669c576c66e757071c0e882de05ac305311d79aded99bfb5a3e9419e nbdime-4.0.2.tar.gz: d8279f8f4b236c0b253b20d60c4831bb67843ed8dbd6e09f234eb011d36f1bf2 nbdime-7.0.2.tgz: b8668ab0a646f6c3c1ff8f2077cf79316eb98008936dabfc010a2c298ff548d7 nbdime-jupyterlab-3.0.2.tgz: 9ac6496fe448b31ed19766d6200e7a0fe77b7dedeef3824a27b421b0b9ece0d3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )