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

Use pep508 environment markers for conditional requirements #6798

Merged
merged 3 commits into from Apr 6, 2020

Conversation

StefanUlbrich
Copy link
Contributor

@StefanUlbrich StefanUlbrich commented Apr 5, 2020

Changelog: Fix: Use pep508 environment markers for defining Conan pip requirements.
Docs: Omit

  • Refer to the issue that supports this Pull Request.
  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.
  • I've read the Contributing guide.
  • I've followed the PEP8 style guides for Python code.
  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Close #6797

#PYVERS: Macos@py27

Add conditional requirements for OSX/Darwin
Conditional requirement expressed in requirements.txt
Remove check for platform darwin.

Conditional requirements have been added to requirement.txt following PEP508 markers
@CLAassistant
Copy link

@CLAassistant CLAassistant commented Apr 5, 2020

CLA assistant check
All committers have signed the CLA.

@memsharded
Copy link
Member

@memsharded memsharded commented Apr 5, 2020

Hi @StefanUlbrich

thanks for your contribution

Please have a look to the CLA, it needs to be signed (it might be that you used a different email for your commits than the Github account one).

@StefanUlbrich
Copy link
Contributor Author

@StefanUlbrich StefanUlbrich commented Apr 5, 2020

Hi! I signed the CLA, CI is failing because the obsolete requirements_osx.txt has been removed. I could not find where it is still referred.

@memsharded
Copy link
Member

@memsharded memsharded commented Apr 5, 2020

That might be in our CI pipeline code. Let us have a look, and we will re-launch this PR when it is fixed.

@memsharded
Copy link
Member

@memsharded memsharded commented Apr 5, 2020

Did a PR to the CI: conan-io/conan_ci_jenkins#19.

@memsharded memsharded added this to the 1.25 milestone Apr 5, 2020
@jgsogo jgsogo mentioned this pull request Apr 6, 2020
@jgsogo
Copy link
Member

@jgsogo jgsogo commented Apr 6, 2020

Running again the CI after merging the changes to our CI

jgsogo
jgsogo approved these changes Apr 6, 2020
@jgsogo jgsogo merged commit 40f7698 into conan-io:develop Apr 6, 2020
2 checks passed
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.

4 participants