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

Fix: ensure is_windows, detect_windows_subsystem, uname work under MSYS/Cygwin #4313

Merged
merged 5 commits into from Jan 17, 2019

Conversation

@SSE4
Copy link
Contributor

@SSE4 SSE4 commented Jan 15, 2019

closes #4312

Changelog: Fix: ensure is_windows, detect_windows_subsystem, uname work under MSYS/Cygwin
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.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

@ghost ghost assigned SSE4 Jan 15, 2019
@ghost ghost added the stage: review label Jan 15, 2019
@SSE4 SSE4 force-pushed the fix_windows_shells branch 2 times, most recently from b78e398 to 8db4362 Jan 15, 2019
…Cygwin shells

Signed-off-by: SSE4 <tomskside@gmail.com>
@SSE4 SSE4 force-pushed the fix_windows_shells branch from 8db4362 to 6916dac Jan 15, 2019
conans/client/tools/oss.py Outdated Show resolved Hide resolved
@memsharded memsharded assigned lasote and unassigned SSE4 Jan 15, 2019
Copy link
Member

@jgsogo jgsogo left a comment

In love with unittests! 😍 Thanks!

conans/test/unittests/util/detected_os_test.py Outdated Show resolved Hide resolved
conans/test/unittests/util/detected_os_test.py Outdated Show resolved Hide resolved
conans/test/unittests/util/osinfo_test.py Outdated Show resolved Hide resolved
conans/test/unittests/util/osinfo_test.py Outdated Show resolved Hide resolved
Signed-off-by: SSE4 <tomskside@gmail.com>
SSE4 added 2 commits Jan 16, 2019
Signed-off-by: SSE4 <tomskside@gmail.com>
Signed-off-by: SSE4 <tomskside@gmail.com>
jgsogo
jgsogo approved these changes Jan 16, 2019
Copy link
Member

@jgsogo jgsogo left a comment

👍 Thanks!

@SSE4
Copy link
Contributor Author

@SSE4 SSE4 commented Jan 16, 2019

it failed with weird error ModuleNotFoundError: No module named 'semver', could you relaunch?

@lasote lasote added this to the 1.12 milestone Jan 17, 2019
@lasote lasote merged commit 98da143 into conan-io:develop Jan 17, 2019
2 checks passed
@ghost ghost removed the stage: review label Jan 17, 2019
@@ -0,0 +1,3 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4
Copy link
Member

@memsharded memsharded Jan 17, 2019

Hi @SSE4

Please try to avoid adding this vim-only line to all the files.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants