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

makedirs: fix mode flag is being ignored starting from Python 3.7 #2790

Merged
merged 6 commits into from
Nov 19, 2019

Conversation

shcheklein
Copy link
Member

Fixes #2789

  • ❗ Have you followed the guidelines in the Contributing to DVC list?

  • πŸ“– Check this box if this PR does not require documentation updates, or if it does and you have created a separate PR in dvc.org with such updates (or at least opened an issue about it in that repo). Please link below to your PR (or issue) in the dvc.org repo.

  • ❌ Have you checked DeepSource, CodeClimate, and other sanity checks below? We consider their findings recommendatory and don't expect everything to be addresses. Please review them carefully and fix those that actually improve code or fix bugs.

Thank you for the contribution - we'll try to review it as soon as possible. πŸ™

@shcheklein
Copy link
Member Author

shcheklein commented Nov 13, 2019

  • probably would be great add some tests for this

@shcheklein shcheklein requested review from pared and a user and removed request for efiop November 14, 2019 01:04
@pared
Copy link
Contributor

pared commented Nov 14, 2019

One comment, also test for 2.7 fails. I tried to reproduce it on my computer, and it seems to fail only for first test run. Maybe something is not unset? Though its done in finally, so I am confused.

Copy link
Contributor

@pared pared left a comment

Choose a reason for hiding this comment

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

One comment

@shcheklein
Copy link
Member Author

also test for 2.7 fails

πŸ‘€

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

looks good to me; just adding that mode flag still works on >=3.7 but it doesn't affect anymore intermediate directories.

@shcheklein
Copy link
Member Author

@MrOutis yep! thanks

just adding that mode flag still works on >=3.7 but it doesn't affect anymore intermediate directories.

yep, #2789 (comment)

Copy link
Contributor

@efiop efiop left a comment

Choose a reason for hiding this comment

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

Please see two comments up above.

@@ -152,9 +152,9 @@ def makedirs(path, exist_ok=False, mode=None):
_makedirs(path, exist_ok=exist_ok)
return

umask = os.umask(0)
umask = os.umask(0o777 - mode)
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's put a comment explaining what is going on :)

Copy link
Member Author

Choose a reason for hiding this comment

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

πŸ‘

def test_makedirs_permissions():
dir_mode = 0o755
intermediate_dir = "тСстовая-дирСктория"
test_dir = os.path.join(intermediate_dir, "data")
Copy link
Contributor

@efiop efiop Nov 19, 2019

Choose a reason for hiding this comment

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

You are creating this directory in the project's root, which is not nice. Please use tmpdir fixture or something like that.

Copy link
Member Author

Choose a reason for hiding this comment

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

good point, simplified using tmpdir

Copy link
Contributor

@efiop efiop left a comment

Choose a reason for hiding this comment

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

Thanks!

@efiop efiop merged commit 689dd95 into iterative:master Nov 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

permissions are not set right for directories DVC creates
3 participants