-
Notifications
You must be signed in to change notification settings - Fork 1k
#5320 Import Python Patch #5761
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
Conversation
- The easiest way to fix our problem related to patching is by the upstream. However, neither the upstream and forks are maintaining the project since 3 years ago. So idea here is importing the original implementation and merging with the current PR in upstream. Signed-off-by: Uilian Ries <[email protected]>
Signed-off-by: Uilian Ries <[email protected]>
another option: https://github.com/libgit2/pygit2 |
Signed-off-by: Uilian Ries <[email protected]>
Signed-off-by: Uilian Ries <[email protected]>
Signed-off-by: Uilian Ries <[email protected]>
Signed-off-by: Uilian Ries <[email protected]>
What am I missing here? I cannot find such |
We need to publish first our fork: https://github.com/conan-io/python-patch-ng |
I assign to myself to review the fork and publish to pypi |
Signed-off-by: Uilian Ries <[email protected]>
I've published the patch-ng. Looks like it broke some test. Check please |
Signed-off-by: Uilian Ries <[email protected]>
We need a test for #5320. I'm not opposed to have it here in Conan. |
Signed-off-by: Uilian Ries <[email protected]>
Signed-off-by: Uilian Ries <[email protected]>
Signed-off-by: Uilian Ries <[email protected]>
client.run("install .") | ||
client.run("build .") | ||
bar_content = load(os.path.join(client.current_folder, "bar.txt")) | ||
self.assertIn(dedent("""Yo no creo en brujas, pero que las hay, las hay |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These asserts here are useless... right? I want to assert the final files in the cache. So do this asserts in the build() method or access to the recipe folder in the cache.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
well, they are the result of patch method. I can internalize in build() but I think it will result on same thing. The original file only contains a part of the phrase, after applying the patch the phrase is complete, so the patch need to work.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, ok. I missed that is a local build() method.
The easiest way to fix our problem related to patching is by the
upstream. However, neither the upstream and their forks are maintaining
the project since 3 years ago.
So idea here is importing the original implementation and merging with the current PR in upstream.
This current PR is able to fix add/rem files using patch apply
Changelog: Fix: Add and remove out-of-tree git patches (#5320)
Docs: Omit
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.