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

Create delete files #41

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

mingwandroid
Copy link

Let's see how this one performs.

@mingwandroid mingwandroid force-pushed the create_delete_files branch 3 times, most recently from 5c2518a to b32e346 Compare June 7, 2016 10:19
@mingwandroid
Copy link
Author

@techtonik, this is ready for your consideration now. I hope to add it soon to https://github.com/conda/conda-build as our patching mechanism because currently we use either the system's patch executable or, on Windows, a broken patch.exe from gnuwin32.

mingwandroid added a commit to mingwandroid/conda-build that referenced this pull request Jun 7, 2016
@mingwandroid mingwandroid force-pushed the create_delete_files branch from b32e346 to d5b90be Compare June 7, 2016 11:34
mingwandroid added a commit to mingwandroid/conda-build that referenced this pull request Jun 7, 2016
`patch.exe` from gnuwin32 has fallen over on several of my bigger
patches now and it's becoming a serious impediment.

I don't want to add MSYS2's `patch.exe` since that requires a lot
of infrastructure to work correctly (though I could build a native
Windows `patch.exe` if necessary).

However rather than relying on some arbitrary `patch` executable,
it's better to use Python to do the work and avoid the subprocess
overhead (though there will be a native-vs-python difference).

Also add automatic patch skip level detection logic, which allows
us to directly use patches generated using `git format-patch` and
also those authored by external entities without needing to add
metadata (although this may not be a bad idea). This part could be
moved into patch.py at a later point perhaps?

I've not added tests for this since upstream has a comprehensive
testsuite (and I did add tests to check my changes to my PR).

Upstream: https://github.com/techtonik/python-patch
Pull Req: techtonik/python-patch#41
mingwandroid added a commit to mingwandroid/conda-build that referenced this pull request Jun 7, 2016
`patch.exe` from gnuwin32 has fallen over on several of my bigger
patches now and it's becoming a serious impediment.

I don't want to add MSYS2's `patch.exe` since that requires a lot
of infrastructure to work correctly (though I could build a native
Windows `patch.exe` if necessary).

However rather than relying on some arbitrary `patch` executable,
it's better to use Python to do the work and avoid the subprocess
overhead (though there will be a native-vs-python difference).

Also add automatic patch skip level detection logic, which allows
us to directly use patches generated using `git format-patch` and
also those authored by external entities without needing to add
metadata (although this may not be a bad idea). This part could be
moved into patch.py at a later point perhaps?

I've not added tests for this since upstream has a comprehensive
testsuite (and I did add tests to check my changes to my PR).

Upstream: https://github.com/techtonik/python-patch
Pull Req: techtonik/python-patch#41
mingwandroid added a commit to mingwandroid/conda-build that referenced this pull request Jun 7, 2016
`patch.exe` from gnuwin32 has fallen over on several of my bigger
patches now and it's becoming a serious impediment.

I don't want to add MSYS2's `patch.exe` since that requires a lot
of infrastructure to work correctly (though I could build a native
Windows `patch.exe` if necessary).

However rather than relying on some arbitrary `patch` executable,
it's better to use Python to do the work and avoid the subprocess
overhead (though there will be a native-vs-python difference).

Also add automatic patch skip level detection logic, which allows
us to directly use patches generated using `git format-patch` and
also those authored by external entities without needing to add
metadata (although this may not be a bad idea). This part could be
moved into patch.py at a later point perhaps?

I've not added tests for this since upstream has a comprehensive
testsuite (and I did add tests to check my changes to my PR).

`patch.py` is also excluded from flake8 for now.

Upstream: https://github.com/techtonik/python-patch
Pull Req: techtonik/python-patch#41
@mingwandroid
Copy link
Author

@techtonik can you please review this?

@uilianries
Copy link

uilianries commented Sep 24, 2019

Hi @techtonik ! Could you please review this PR? This fix is important.

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.

2 participants