Use startswith('linux') to check for the Linux platform #1263
Conversation
Codecov Report
@@ Coverage Diff @@
## develop #1263 +/- ##
===========================================
- Coverage 83.29% 83.29% -0.01%
===========================================
Files 117 117
Lines 12922 12922
===========================================
- Hits 10764 10763 -1
- Misses 2158 2159 +1
Continue to review full report at Codecov.
|
|
@sschuberth thank you. Do you mind adding you sign-off (either in each of the commit or at least in the body of this PR)? |
etc/conf/base.py
Outdated
| os = 'linux' | ||
| elif 'win32' in sys_platform: | ||
| elif sys_platform == 'win32': |
There was a problem hiding this comment.
There may be some risk attached to changing the tests here... Do you mind leaving these as is?
etc/configure.py
Outdated
| platform_names = ('posix', 'linux',) | ||
| elif 'win32' in sys_platform: | ||
| elif sys_platform == 'win32': |
There was a problem hiding this comment.
Same as above... please only change the Linux test.
thirdparty/virtualenv.py
Outdated
| @@ -1052,10 +1052,10 @@ def copy_required_modules(dst_prefix, symlink): | |||
| if f is not None: | |||
| f.close() | |||
| # special-case custom readline.so on OS X, but not for pypy: | |||
| if modname == 'readline' and sys.platform == 'darwin' and not ( | |||
| if modname == 'readline' and is_darwin and not ( | |||
There was a problem hiding this comment.
You should not change anything in virtualenv... this is the official/standard code so it should not be modified .
pombredanne
changed the title
sschuberth
force-pushed
the
sys-platform-startswith
branch
from
f47d9b6 to
46d3573
Compare
|
@pombredanne, I've addressed all your comments. |
Some platforms like Alpine Linux actually return 'linux2' here, i.e. they include the major Linux version as a suffix, also see [1]. [1] https://docs.python.org/dev/library/sys.html#sys.platform Signed-off-by: Sebastian Schuberth <[email protected]>
sschuberth
force-pushed
the
sys-platform-startswith
branch
from
46d3573 to
3c55c59
Compare
sschuberth
changed the title
|
@sschuberth Thanks++, merging |
This is to support #1262