Skip to content

Conversation

@bnavigator
Copy link
Collaborator

Merge all conda recipes into one. This builds on top of #142.

@bnavigator bnavigator force-pushed the merge-recipes branch 2 times, most recently from 0df0f45 to ea2341f Compare January 8, 2021 16:18
@roryyorke
Copy link
Collaborator

LGTM. I'll leave it to you to merge, so you can decide on sequence of this vs #140.

@bnavigator
Copy link
Collaborator Author

Let's give @repagh some time to chime in.

@bnavigator bnavigator mentioned this pull request Jan 11, 2021
8 tasks
@bnavigator
Copy link
Collaborator Author

I changed some README paragraphs reflecting the new merged conda recipe situation.

With Python 3.6+ The windows compiler is the same for all versions.

@roryyorke
Copy link
Collaborator

This is now part of #140?

@bnavigator
Copy link
Collaborator Author

Not necessarily. The branch for #140 just is based on this branch. So merge this first, then #140. Or, if #140 is merged, this PR will automatically be merged as well.

@roryyorke roryyorke merged commit 2e22674 into python-control:master Jan 30, 2021
@bnavigator bnavigator deleted the merge-recipes branch May 3, 2022 19:07
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