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

V3.8.6 #396

Merged
merged 4 commits into from
Oct 7, 2020
Merged

V3.8.6 #396

merged 4 commits into from
Oct 7, 2020

Conversation

ocefpaf
Copy link
Member

@ocefpaf ocefpaf commented Oct 7, 2020

@mingwandroid I used your workflow to handle the patches here. Do you mind taking a look?

@conda-forge-linter
Copy link

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

@mingwandroid
Copy link
Contributor

I also have git-format-patch-le.py which is a little better than make-mixed in that it can emit patch files with the correct line endings when those vary between files. Still, @jjhelmus has good luck with git config --global core.autocrlf false for regenerating patches like this. I never had any luck and false is the default for that and I'm not sure it does anything on non-Windows.

@ocefpaf
Copy link
Member Author

ocefpaf commented Oct 7, 2020

I also have git-format-patch-le.py which is a little better than make-mixed in that it can emit patch files with the correct line endings when those vary between files.

I have both scripts here. Thanks! I'm just experimenting for now. But good to know that git-format-patch-le.py is better.

Still, @jjhelmus has good luck with git config --global core.autocrlf false for regenerating patches like this. I never had any luck and false is the default for that and I'm not sure it does anything on non-Windows.

Yep. I forgot to do that. But I'm adding it to the docs I'm writing.

@jjhelmus
Copy link
Contributor

jjhelmus commented Oct 7, 2020

LGTM

@jjhelmus
Copy link
Contributor

jjhelmus commented Oct 7, 2020

Might be good change this PR to merge into the 3.8 branch so that #395 does not need to be re-based.

@ocefpaf
Copy link
Member Author

ocefpaf commented Oct 7, 2020

Might be good change this PR to merge into the 3.8 branch so that #395 does not need to be re-based.

Indeed. Let me fix that.

@ocefpaf ocefpaf changed the base branch from master to 3.8 October 7, 2020 17:03
@jjhelmus jjhelmus added the automerge Merge the PR when CI passes label Oct 7, 2020
@jjhelmus jjhelmus merged commit bf32e40 into conda-forge:3.8 Oct 7, 2020
@ocefpaf ocefpaf deleted the v3.8.6 branch October 7, 2020 18:15
@ocefpaf
Copy link
Member Author

ocefpaf commented Oct 7, 2020

Thanks @jjhelmus for the review! And thanks you both for teaching me something new! I now (kind of) know how to manage these patches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge the PR when CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants