Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare for jupyter_server preferred_dir fix #324

Merged
merged 8 commits into from
Jan 3, 2023

Conversation

vidartf
Copy link
Member

@vidartf vidartf commented Oct 14, 2022

Support relocated trait in jupyter_server (jupyter-server/jupyter_server#983).

Falls back on the old trait name if the new one is undefined or ill defined.

@codecov-commenter
Copy link

codecov-commenter commented Oct 14, 2022

Codecov Report

Base: 81.05% // Head: 81.27% // Increases project coverage by +0.21% 🎉

Coverage data is based on head (7ea09a6) compared to base (b8aad00).
Patch coverage: 77.77% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #324      +/-   ##
==========================================
+ Coverage   81.05%   81.27%   +0.21%     
==========================================
  Files          22       22              
  Lines        1737     1752      +15     
  Branches      334      334              
==========================================
+ Hits         1408     1424      +16     
  Misses        227      227              
+ Partials      102      101       -1     
Impacted Files Coverage Δ
jupyterlab_server/__main__.py 0.00% <ø> (ø)
jupyterlab_server/_version.py 80.00% <ø> (+2.22%) ⬆️
jupyterlab_server/licenses_app.py 100.00% <ø> (ø)
jupyterlab_server/process_app.py 92.59% <ø> (+0.28%) ⬆️
jupyterlab_server/pytest_plugin.py 85.24% <ø> (+0.24%) ⬆️
jupyterlab_server/server.py 100.00% <ø> (ø)
jupyterlab_server/spec.py 87.50% <ø> (+0.83%) ⬆️
jupyterlab_server/test_utils.py 75.20% <ø> (+0.20%) ⬆️
jupyterlab_server/translation_utils.py 81.49% <ø> (+0.07%) ⬆️
jupyterlab_server/workspaces_app.py 88.23% <ø> (+0.17%) ⬆️
... and 12 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@vidartf
Copy link
Member Author

vidartf commented Oct 14, 2022

I'm not sure what the CI error is about, but I'm assuming it is unrelated?

@fcollonval
Copy link
Member

CI failures are related to jupyterlab/maintainer-tools#138

@fcollonval
Copy link
Member

@vidartf could you confirm this is waiting for a new release of jupyter-server?

@vidartf
Copy link
Member Author

vidartf commented Dec 14, 2022

@fcollonval This was waiting for a final structure on the jupyter-server PR. Now that it has been merged, I will update this PR. After that it can be be merged and ideally released before the jupyter-server release.

@vidartf
Copy link
Member Author

vidartf commented Dec 17, 2022

One of the tests that call pytest.skip seems to reliably be causing timeout errors on cleanup. Any thoughts on how to resolve this?

@fcollonval
Copy link
Member

@vidartf does it raise an error if you return instead of raising skip?

@blink1073
Copy link
Contributor

I just released a new version of pytest-jupyter, kicking the tests.

@blink1073
Copy link
Contributor

Ugh, apparently concurrent.futures._base.TimeoutError is not the same as TimeoutError.

@blink1073
Copy link
Contributor

Okay, we're good now. The lint job failed because it couldn't yet find the new pytest-jupyter, and the macos jobs are queued due to the recent jupyterlab release.

@fcollonval
Copy link
Member

Thanks a lot @blink1073 for quickly fixing the pytest package

Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @vidartf

Is it okay if I merge and then release jupyterlab_server?

@fcollonval fcollonval enabled auto-merge (squash) January 3, 2023 08:53
@fcollonval fcollonval merged commit a252887 into jupyterlab:main Jan 3, 2023
@fcollonval
Copy link
Member

jupyterlab_server 2.18.0 has been released with this feature

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants