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

#4399 Fix config install for hooks #4412

Merged
merged 5 commits into from Jan 30, 2019
Merged

Conversation

@uilianries
Copy link
Member

@uilianries uilianries commented Jan 29, 2019

.git folder is checked twice when installing hooks and all files from source folder are skipped (bug). Since .git folder is verified by _process_folder,
we dont need to check it again, just copy all files from source to target folder
as done for profile.

I've added an unit test to check copy tree behavior. Is there a possible functional test to be added?

fixes #4399

Changelog: Bugfix: Fixes config install when copying hooks
Docs: omit

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

- .git folder is checked twice and all files from source folder
  are skipped. Since .git folder is verified by _process_folder,
  we dont need to check again, just copy all file from source to target
  as done for profile.
- add unit test to check copy tree behavior

Signed-off-by: Uilian Ries <uilianries@gmail.com>
@ghost ghost assigned uilianries Jan 29, 2019
@ghost ghost added the stage: review label Jan 29, 2019
uilianries added 2 commits Jan 29, 2019
- Copy file and subdir from hooks
- Update functional test to check hooks folder
- Update unit test for hooks folder

Signed-off-by: Uilian Ries <uilianries@gmail.com>
- Skip .git folder when copying hooks
- Update functional and unit test to validate .git folder case
- Apply PEP8 format (yaml)

Signed-off-by: Uilian Ries <uilianries@gmail.com>
Copy link
Member

@danimtb danimtb left a comment

👍

The code formatting makes a little bit difficult to read the diff

@uilianries
Copy link
Member Author

@uilianries uilianries commented Jan 29, 2019

My fault, I should postponed pep8

Copy link
Member

@memsharded memsharded left a comment

I think can be merged, but please @uilianries have a look at the style comments.

conans/client/conf/config_installer.py Outdated Show resolved Hide resolved
conans/client/conf/config_installer.py Outdated Show resolved Hide resolved
@uilianries
Copy link
Member Author

@uilianries uilianries commented Jan 29, 2019

TIL: We need to specify a code format file. 😅

@lasote
Copy link
Contributor

@lasote lasote commented Jan 29, 2019

The release is two days late already, please review the styling comments asap if not done already. Everything not merged tomorrow morning won't be included.

@lasote lasote added this to the 1.12 milestone Jan 29, 2019
@ghost ghost assigned danimtb Jan 30, 2019
@danimtb
Copy link
Member

@danimtb danimtb commented Jan 30, 2019

I have reverted most of the formatting

@danimtb danimtb assigned lasote and unassigned uilianries and danimtb Jan 30, 2019
@lasote lasote merged commit bbf2b42 into conan-io:release/1.12.0 Jan 30, 2019
2 checks passed
@ghost ghost removed the stage: review label Jan 30, 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
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants