Skip to content

V3.8.6#396

Merged
jjhelmus merged 4 commits into
conda-forge:3.8from
ocefpaf:v3.8.6
Oct 7, 2020
Merged

V3.8.6#396
jjhelmus merged 4 commits into
conda-forge:3.8from
ocefpaf:v3.8.6

Conversation

@ocefpaf

@ocefpaf ocefpaf commented Oct 7, 2020

Copy link
Copy Markdown
Member

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

@conda-forge-linter

Copy link
Copy Markdown

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.

Comment thread recipe/meta.yaml
@mingwandroid

Copy link
Copy Markdown
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

ocefpaf commented Oct 7, 2020

Copy link
Copy Markdown
Member Author

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

jjhelmus commented Oct 7, 2020

Copy link
Copy Markdown
Contributor

LGTM

@jjhelmus

jjhelmus commented Oct 7, 2020

Copy link
Copy Markdown
Contributor

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

@ocefpaf

ocefpaf commented Oct 7, 2020

Copy link
Copy Markdown
Member Author

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

ocefpaf commented Oct 7, 2020

Copy link
Copy Markdown
Member Author

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