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

Allow non-empty directory deletion through settings #574

Merged
merged 2 commits into from
Aug 23, 2021

Conversation

fcollonval
Copy link
Member

Fixes #570

@codecov-commenter
Copy link

codecov-commenter commented Aug 20, 2021

Codecov Report

Merging #574 (6decf7a) into master (90f619c) will increase coverage by 0.19%.
The diff coverage is 85.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #574      +/-   ##
==========================================
+ Coverage   77.12%   77.32%   +0.19%     
==========================================
  Files         109      109              
  Lines       10115    10137      +22     
  Branches     1089     1093       +4     
==========================================
+ Hits         7801     7838      +37     
+ Misses       1929     1909      -20     
- Partials      385      390       +5     
Impacted Files Coverage Δ
jupyter_server/services/contents/filemanager.py 70.55% <71.42%> (+3.54%) ⬆️
...ter_server/tests/services/contents/test_manager.py 96.95% <90.47%> (-0.34%) ⬇️

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 90f619c...6decf7a. Read the comment docs.

@blink1073
Copy link
Collaborator

FYI this now has a merge conflict from the formatting changes in #575

@fcollonval fcollonval marked this pull request as ready for review August 20, 2021 12:03
@fcollonval
Copy link
Member Author

@blink1073 CI tests failing are identical to the one on master. Is this one good to go?

@blink1073 blink1073 added this to the 1.10 milestone Aug 23, 2021
Copy link
Collaborator

@blink1073 blink1073 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks! Let's wait for @Zsailer to have a look as well

Co-authored-by: Kevin Bates <kbates4@gmail.com>
@blink1073 blink1073 merged commit e3a146e into jupyter-server:master Aug 23, 2021
@fcollonval fcollonval deleted the fcollonval/issue570 branch August 23, 2021 15:38
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.

Allow non-empty directory deletion for windows through settings
4 participants