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.

Sign up for GitHub

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

Jump to bottom

place manylinux1 after linux tag #3921

Closed
wants to merge 2 commits into from
Closed

place manylinux1 after linux tag #3921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a08adf2
place manylinux1 after linux tag
dholth Aug 20, 2016
13d4c7b
update test_pep425tags
dholth Aug 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pip/pep425tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def get_supported(versions=None, noarch=False, platform=None,
# arch pattern didn't match (?!)
arches = [arch]
elif platform is None and is_manylinux1_compatible():
arches = [arch.replace('linux', 'manylinux1'), arch]
arches = [arch, arch.replace('linux', 'manylinux1')]
else:
arches = [arch]

Expand Down
8 changes: 4 additions & 4 deletions tests/unit/test_pep425tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,9 @@ def test_manylinux1_3(self):
@patch('pip.pep425tags.get_platform', lambda: 'linux_x86_64')
@patch('pip.utils.glibc.have_compatible_glibc', lambda major, minor: True)
@patch('sys.platform', 'linux2')
def test_manylinux1_tag_is_first(self):
def test_manylinux1_tag_is_second(self):
"""
Test that the more specific tag manylinux1 comes first.
Test that the less specific tag manylinux1 comes second.
"""
groups = {}
for pyimpl, abi, arch in pep425tags.get_supported():
Expand All @@ -156,6 +156,6 @@ def test_manylinux1_tag_is_first(self):
continue
# Expect the most specific arch first:
if len(arches) == 3:
assert arches == ['manylinux1_x86_64', 'linux_x86_64', 'any']
assert arches == ['linux_x86_64', 'manylinux1_x86_64', 'any']
else:
assert arches == ['manylinux1_x86_64', 'linux_x86_64']
assert arches == ['linux_x86_64', 'manylinux1_x86_64']