Reconcile hard fork now that access is restored #174
Merged
Conversation
This file contains 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
`files_handler_params` in the base class is empty and we need to set the `path` arg to root dir for endpoint `/files/(.*)` to work. If not tornado web will complain about missing path arg
remove incorrect file
uplift ci without JLab upgrade
Fix download file
fork project
Update to JupyterLab 4
Don't replace : with /
Temporary fix for broken is_hidden
Without this the drives of the meta manager will not be found.
Add missing JS dev dependency
Add missing Python dev dependency
Improve dev instructions
Also addresses jupyter-server/jupyter_server#1224 for our implementation. Also does: - Improves tests by using an actual jupyter server instance instead of calling CM methods directly (gains config + handler logic) - Moves conftest to root, as this is needed by pytest for naming plugins - FSManager init calls super: this enables the traitlets config system
This prevents fs widgets from being recreated if other resources in the list changes.
To reuse in new tests
Allow server admins to deny users adding resources at all. Alternatively, they can configure regexes to only allow certain resource URLs to be configured by users.
…ue in default configuration of validators to default to 'allow any'
Don't replace : with /
Temporary fix for broken is_hidden
Without this the drives of the meta manager will not be found.
Add missing JS dev dependency
Add missing Python dev dependency
Improve dev instructions
Also addresses jupyter-server/jupyter_server#1224 for our implementation. Also does: - Improves tests by using an actual jupyter server instance instead of calling CM methods directly (gains config + handler logic) - Moves conftest to root, as this is needed by pytest for naming plugins - FSManager init calls super: this enables the traitlets config system
This prevents fs widgets from being recreated if other resources in the list changes.
To reuse in new tests
Allow server admins to deny users adding resources at all. Alternatively, they can configure regexes to only allow certain resource URLs to be configured by users.
If we fail for some reason, we should try to inform the user.
Workaround for bug in tree-finder/regular-table. In certain conditions (race condition), you can end up with two resize handles instead of the assumed empty span + resize handle. (This might be due to memoization in regular-table ?) In this case, we recover back to the state that tree-finder was expecting. Can be removed once underlying issue is resolved.
Add proper JupyterLab theming support
JPM Omnibus
This still does not allow ducktyping via config.
Allow CM class to be configurable.
|
|
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #174 +/- ##
==========================================
- Coverage 40.50% 37.86% -2.65%
==========================================
Files 23 31 +8
Lines 1153 1965 +812
Branches 143 312 +169
==========================================
+ Hits 467 744 +277
- Misses 643 1119 +476
- Partials 43 102 +59
☔ View full report in Codecov by Sentry. |
This was referenced Oct 10, 2023
Closed
Closed
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.20.5 to 7.23.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse) --- updated-dependencies: - dependency-name: "@babel/traverse" dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…averse-7.23.2 Bump @babel/traverse from 7.20.5 to 7.23.2
|
@vidartf @brooklynrob @t3rryM please merge or restore my ability to do so, thanks! |
|
Thanks for reconciling the different merge conflicts! |
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.
I have now deleted my hard fork, this is the omnibus PR to resolve the differences:
Fixes: #172
Closes: #170
Closes: #169
Closes: #163
Closes: #162
Closes: #161