Skip to content

Centralize app cleanup - #792

Merged
Zsailer merged 9 commits into
jupyter-server:mainfrom
blink1073:centralize-cleanup
Apr 29, 2022
Merged

Centralize app cleanup#792
Zsailer merged 9 commits into
jupyter-server:mainfrom
blink1073:centralize-cleanup

Conversation

@blink1073

@blink1073 blink1073 commented Apr 16, 2022

Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor Author

Should hopefully pass now that jupyter_client 7.3 is released.

@blink1073
blink1073 force-pushed the centralize-cleanup branch from 23e3288 to a48e2f5 Compare April 26, 2022 11:53
@blink1073
blink1073 force-pushed the centralize-cleanup branch from 7c62a6d to 726948f Compare April 27, 2022 00:51
@codecov-commenter

codecov-commenter commented Apr 29, 2022

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 80.00000% with 7 lines in your changes missing coverage. Please review.
✅ Project coverage is 70.00%. Comparing base (73a03a6) to head (446dd4a).
⚠️ Report is 525 commits behind head on main.

Files with missing lines Patch % Lines
jupyter_server/services/kernels/kernelmanager.py 76.19% 2 Missing and 3 partials ⚠️
jupyter_server/pytest_plugin.py 83.33% 1 Missing ⚠️
jupyter_server/serverapp.py 87.50% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #792      +/-   ##
==========================================
+ Coverage   69.96%   70.00%   +0.04%     
==========================================
  Files          62       62              
  Lines        7368     7355      -13     
  Branches     1223     1225       +2     
==========================================
- Hits         5155     5149       -6     
+ Misses       1841     1835       -6     
+ Partials      372      371       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

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

Zsailer commented Apr 29, 2022

Copy link
Copy Markdown
Member

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
Copy Markdown
Contributor

Great stuff.

@Zsailer

Zsailer commented Apr 29, 2022

Copy link
Copy Markdown
Member

@meeseeksmachine please backport to 1.x.

@blink1073

Copy link
Copy Markdown
Contributor Author

@meeseeksdev please backport to 1.x

@lumberbot-app

lumberbot-app Bot commented Apr 29, 2022

Copy link
Copy Markdown

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 pushed 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