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

Centralize app cleanup #792

Merged
merged 9 commits into from
Apr 29, 2022
Merged

Conversation

blink1073
Copy link
Contributor

@blink1073 blink1073 commented Apr 16, 2022

Potentially fixes #790

  • Automatically clean up all server apps created in tests
  • Add more cleanup logic to serverapp itself

Depends on jupyter/jupyter_client#772

TODO:

@blink1073
Copy link
Contributor Author

Should hopefully pass now that jupyter_client 7.3 is released.

@codecov-commenter
Copy link

codecov-commenter commented Apr 29, 2022

Codecov Report

Merging #792 (446dd4a) into main (73a03a6) will increase coverage by 0.02%.
The diff coverage is 80.00%.

@@            Coverage Diff             @@
##             main     #792      +/-   ##
==========================================
+ Coverage   69.96%   69.99%   +0.02%     
==========================================
  Files          62       62              
  Lines        7368     7355      -13     
  Branches     1223     1225       +2     
==========================================
- Hits         5155     5148       -7     
+ Misses       1841     1835       -6     
  Partials      372      372              
Impacted Files Coverage Δ
jupyter_server/services/kernels/kernelmanager.py 78.64% <76.19%> (-1.03%) ⬇️
jupyter_server/pytest_plugin.py 87.61% <83.33%> (+3.80%) ⬆️
jupyter_server/serverapp.py 64.96% <87.50%> (-0.15%) ⬇️
jupyter_server/utils.py 62.37% <0.00%> (+0.99%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 73a03a6...446dd4a. Read the comment docs.

@blink1073 blink1073 marked this pull request as ready for review April 29, 2022 00:30
@Zsailer
Copy link
Member

Zsailer commented Apr 29, 2022

Wow, this is awesome. So much cleaner than before. Thank you, @blink1073!

@Zsailer Zsailer merged commit bf40316 into jupyter-server:main Apr 29, 2022
@bollwyvl
Copy link
Contributor

Great stuff.

@Zsailer
Copy link
Member

Zsailer commented Apr 29, 2022

@meeseeksmachine please backport to 1.x.

@blink1073
Copy link
Contributor Author

@meeseeksdev please backport to 1.x

@lumberbot-app
Copy link

lumberbot-app bot commented Apr 29, 2022

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 1.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 bf40316fcacc7cdd9c0c75534ae1b4ea78c26c9f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #792: Centralize app cleanup'
  1. Push to a named branch:
git push YOURFORK 1.x:auto-backport-of-pr-792-on-1.x
  1. Create a PR against branch 1.x, I would have named this PR:

"Backport PR #792 on branch 1.x (Centralize app cleanup)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@blink1073 blink1073 deleted the centralize-cleanup branch April 29, 2022 18:13
blink1073 added a commit to blink1073/jupyter_server that referenced this pull request Apr 29, 2022
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.

SQLite objects created in a thread Exception
4 participants