Skip to content

#4399 Fix config install for hooks - #4412

Merged
lasote merged 5 commits into
conan-io:release/1.12.0from
uilianries:hotfix/hooks
Jan 30, 2019
Merged

lasote merged 5 commits into
conan-io:release/1.12.0from
uilianries:hotfix/hooks

Conversation

@uilianries

@uilianries uilianries commented Jan 29, 2019

Copy link
Copy Markdown
Member

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

@danimtb danimtb left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍

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

@uilianries

Copy link
Copy Markdown
Member Author

My fault, I should postponed pep8

@memsharded memsharded left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

Comment thread conans/client/conf/config_installer.py Outdated
Comment thread conans/client/conf/config_installer.py Outdated
@uilianries

Copy link
Copy Markdown
Member Author

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

Comment thread conans/client/conf/config_installer.py
@lasote

lasote commented Jan 29, 2019

Copy link
Copy Markdown
Contributor

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

danimtb commented Jan 30, 2019

Copy link
Copy Markdown
Member

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

Development

Successfully merging this pull request may close these issues.

5 participants