Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
3d811b93
Commit
3d811b93
authored
Aug 23, 2019
by
Benoit Pierre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wheel: switch to `packaging.tags` for checking PEP 425 tags
parent
bf069fe9
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
2 additions
and
629 deletions
+2
-629
setuptools/glibc.py
setuptools/glibc.py
+0
-86
setuptools/pep425tags.py
setuptools/pep425tags.py
+0
-319
setuptools/tests/test_glibc.py
setuptools/tests/test_glibc.py
+0
-52
setuptools/tests/test_pep425tags.py
setuptools/tests/test_pep425tags.py
+0
-170
setuptools/wheel.py
setuptools/wheel.py
+2
-2
No files found.
setuptools/glibc.py
deleted
100644 → 0
View file @
bf069fe9
# This file originally from pip:
# https://github.com/pypa/pip/blob/8f4f15a5a95d7d5b511ceaee9ed261176c181970/src/pip/_internal/utils/glibc.py
from
__future__
import
absolute_import
import
ctypes
import
re
import
warnings
def
glibc_version_string
():
"Returns glibc version string, or None if not using glibc."
# ctypes.CDLL(None) internally calls dlopen(NULL), and as the dlopen
# manpage says, "If filename is NULL, then the returned handle is for the
# main program". This way we can let the linker do the work to figure out
# which libc our process is actually using.
process_namespace
=
ctypes
.
CDLL
(
None
)
try
:
gnu_get_libc_version
=
process_namespace
.
gnu_get_libc_version
except
AttributeError
:
# Symbol doesn't exist -> therefore, we are not linked to
# glibc.
return
None
# Call gnu_get_libc_version, which returns a string like "2.5"
gnu_get_libc_version
.
restype
=
ctypes
.
c_char_p
version_str
=
gnu_get_libc_version
()
# py2 / py3 compatibility:
if
not
isinstance
(
version_str
,
str
):
version_str
=
version_str
.
decode
(
"ascii"
)
return
version_str
# Separated out from have_compatible_glibc for easier unit testing
def
check_glibc_version
(
version_str
,
required_major
,
minimum_minor
):
# Parse string and check against requested version.
#
# We use a regexp instead of str.split because we want to discard any
# random junk that might come after the minor version -- this might happen
# in patched/forked versions of glibc (e.g. Linaro's version of glibc
# uses version strings like "2.20-2014.11"). See gh-3588.
m
=
re
.
match
(
r"(?P<major>[0-9]+)\
.(?P<mi
nor>[0-9]+)"
,
version_str
)
if
not
m
:
warnings
.
warn
(
"Expected glibc version with 2 components major.minor,"
" got: %s"
%
version_str
,
RuntimeWarning
)
return
False
return
(
int
(
m
.
group
(
"major"
))
==
required_major
and
int
(
m
.
group
(
"minor"
))
>=
minimum_minor
)
def
have_compatible_glibc
(
required_major
,
minimum_minor
):
version_str
=
glibc_version_string
()
if
version_str
is
None
:
return
False
return
check_glibc_version
(
version_str
,
required_major
,
minimum_minor
)
# platform.libc_ver regularly returns completely nonsensical glibc
# versions. E.g. on my computer, platform says:
#
# ~$ python2.7 -c 'import platform; print(platform.libc_ver())'
# ('glibc', '2.7')
# ~$ python3.5 -c 'import platform; print(platform.libc_ver())'
# ('glibc', '2.9')
#
# But the truth is:
#
# ~$ ldd --version
# ldd (Debian GLIBC 2.22-11) 2.22
#
# This is unfortunate, because it means that the linehaul data on libc
# versions that was generated by pip 8.1.2 and earlier is useless and
# misleading. Solution: instead of using platform, use our code that actually
# works.
def
libc_ver
():
"""Try to determine the glibc version
Returns a tuple of strings (lib, version) which default to empty strings
in case the lookup fails.
"""
glibc_version
=
glibc_version_string
()
if
glibc_version
is
None
:
return
(
""
,
""
)
else
:
return
(
"glibc"
,
glibc_version
)
setuptools/pep425tags.py
deleted
100644 → 0
View file @
bf069fe9
This diff is collapsed.
Click to expand it.
setuptools/tests/test_glibc.py
deleted
100644 → 0
View file @
bf069fe9
import
warnings
import
pytest
from
setuptools.glibc
import
check_glibc_version
__metaclass__
=
type
@
pytest
.
fixture
(
params
=
[
"2.20"
,
# used by "linaro glibc", see gh-3588
"2.20-2014.11"
,
# weird possibilities that I just made up
"2.20+dev"
,
"2.20-custom"
,
"2.20.1"
,
])
def
two_twenty
(
request
):
return
request
.
param
@
pytest
.
fixture
(
params
=
[
"asdf"
,
""
,
"foo.bar"
])
def
bad_string
(
request
):
return
request
.
param
class
TestGlibc
:
def
test_manylinux1_check_glibc_version
(
self
,
two_twenty
):
"""
Test that the check_glibc_version function is robust against weird
glibc version strings.
"""
assert
check_glibc_version
(
two_twenty
,
2
,
15
)
assert
check_glibc_version
(
two_twenty
,
2
,
20
)
assert
not
check_glibc_version
(
two_twenty
,
2
,
21
)
assert
not
check_glibc_version
(
two_twenty
,
3
,
15
)
assert
not
check_glibc_version
(
two_twenty
,
1
,
15
)
def
test_bad_versions
(
self
,
bad_string
):
"""
For unparseable strings, warn and return False
"""
with
warnings
.
catch_warnings
(
record
=
True
)
as
ws
:
warnings
.
filterwarnings
(
"always"
)
assert
not
check_glibc_version
(
bad_string
,
2
,
5
)
for
w
in
ws
:
if
"Expected glibc version with"
in
str
(
w
.
message
):
break
else
:
# Didn't find the warning we were expecting
assert
False
setuptools/tests/test_pep425tags.py
deleted
100644 → 0
View file @
bf069fe9
import
sys
import
pytest
from
mock
import
patch
from
setuptools
import
pep425tags
__metaclass__
=
type
class
TestPEP425Tags
:
def
mock_get_config_var
(
self
,
**
kwd
):
"""
Patch sysconfig.get_config_var for arbitrary keys.
"""
get_config_var
=
pep425tags
.
sysconfig
.
get_config_var
def
_mock_get_config_var
(
var
):
if
var
in
kwd
:
return
kwd
[
var
]
return
get_config_var
(
var
)
return
_mock_get_config_var
def
abi_tag_unicode
(
self
,
flags
,
config_vars
):
"""
Used to test ABI tags, verify correct use of the `u` flag
"""
config_vars
.
update
({
'SOABI'
:
None
})
base
=
pep425tags
.
get_abbr_impl
()
+
pep425tags
.
get_impl_ver
()
if
sys
.
version_info
<
(
3
,
3
):
config_vars
.
update
({
'Py_UNICODE_SIZE'
:
2
})
mock_gcf
=
self
.
mock_get_config_var
(
**
config_vars
)
with
patch
(
'setuptools.pep425tags.sysconfig.get_config_var'
,
mock_gcf
):
abi_tag
=
pep425tags
.
get_abi_tag
()
assert
abi_tag
==
base
+
flags
config_vars
.
update
({
'Py_UNICODE_SIZE'
:
4
})
mock_gcf
=
self
.
mock_get_config_var
(
**
config_vars
)
with
patch
(
'setuptools.pep425tags.sysconfig.get_config_var'
,
mock_gcf
):
abi_tag
=
pep425tags
.
get_abi_tag
()
assert
abi_tag
==
base
+
flags
+
'u'
else
:
# On Python >= 3.3, UCS-4 is essentially permanently enabled, and
# Py_UNICODE_SIZE is None. SOABI on these builds does not include
# the 'u' so manual SOABI detection should not do so either.
config_vars
.
update
({
'Py_UNICODE_SIZE'
:
None
})
mock_gcf
=
self
.
mock_get_config_var
(
**
config_vars
)
with
patch
(
'setuptools.pep425tags.sysconfig.get_config_var'
,
mock_gcf
):
abi_tag
=
pep425tags
.
get_abi_tag
()
assert
abi_tag
==
base
+
flags
def
test_broken_sysconfig
(
self
):
"""
Test that pep425tags still works when sysconfig is broken.
Can be a problem on Python 2.7
Issue #1074.
"""
def
raises_ioerror
(
var
):
raise
IOError
(
"I have the wrong path!"
)
with
patch
(
'setuptools.pep425tags.sysconfig.get_config_var'
,
raises_ioerror
):
with
pytest
.
warns
(
RuntimeWarning
):
assert
len
(
pep425tags
.
get_supported
())
def
test_no_hyphen_tag
(
self
):
"""
Test that no tag contains a hyphen.
"""
mock_gcf
=
self
.
mock_get_config_var
(
SOABI
=
'cpython-35m-darwin'
)
with
patch
(
'setuptools.pep425tags.sysconfig.get_config_var'
,
mock_gcf
):
supported
=
pep425tags
.
get_supported
()
for
(
py
,
abi
,
plat
)
in
supported
:
assert
'-'
not
in
py
assert
'-'
not
in
abi
assert
'-'
not
in
plat
def
test_manual_abi_noflags
(
self
):
"""
Test that no flags are set on a non-PyDebug, non-Pymalloc ABI tag.
"""
self
.
abi_tag_unicode
(
''
,
{
'Py_DEBUG'
:
False
,
'WITH_PYMALLOC'
:
False
})
def
test_manual_abi_d_flag
(
self
):
"""
Test that the `d` flag is set on a PyDebug, non-Pymalloc ABI tag.
"""
self
.
abi_tag_unicode
(
'd'
,
{
'Py_DEBUG'
:
True
,
'WITH_PYMALLOC'
:
False
})
def
test_manual_abi_m_flag
(
self
):
"""
Test that the `m` flag is set on a non-PyDebug, Pymalloc ABI tag.
"""
self
.
abi_tag_unicode
(
'm'
,
{
'Py_DEBUG'
:
False
,
'WITH_PYMALLOC'
:
True
})
def
test_manual_abi_dm_flags
(
self
):
"""
Test that the `dm` flags are set on a PyDebug, Pymalloc ABI tag.
"""
self
.
abi_tag_unicode
(
'dm'
,
{
'Py_DEBUG'
:
True
,
'WITH_PYMALLOC'
:
True
})
class
TestManylinux1Tags
:
@
patch
(
'setuptools.pep425tags.get_platform'
,
lambda
:
'linux_x86_64'
)
@
patch
(
'setuptools.glibc.have_compatible_glibc'
,
lambda
major
,
minor
:
True
)
def
test_manylinux1_compatible_on_linux_x86_64
(
self
):
"""
Test that manylinux1 is enabled on linux_x86_64
"""
assert
pep425tags
.
is_manylinux1_compatible
()
@
patch
(
'setuptools.pep425tags.get_platform'
,
lambda
:
'linux_i686'
)
@
patch
(
'setuptools.glibc.have_compatible_glibc'
,
lambda
major
,
minor
:
True
)
def
test_manylinux1_compatible_on_linux_i686
(
self
):
"""
Test that manylinux1 is enabled on linux_i686
"""
assert
pep425tags
.
is_manylinux1_compatible
()
@
patch
(
'setuptools.pep425tags.get_platform'
,
lambda
:
'linux_x86_64'
)
@
patch
(
'setuptools.glibc.have_compatible_glibc'
,
lambda
major
,
minor
:
False
)
def
test_manylinux1_2
(
self
):
"""
Test that manylinux1 is disabled with incompatible glibc
"""
assert
not
pep425tags
.
is_manylinux1_compatible
()
@
patch
(
'setuptools.pep425tags.get_platform'
,
lambda
:
'arm6vl'
)
@
patch
(
'setuptools.glibc.have_compatible_glibc'
,
lambda
major
,
minor
:
True
)
def
test_manylinux1_3
(
self
):
"""
Test that manylinux1 is disabled on arm6vl
"""
assert
not
pep425tags
.
is_manylinux1_compatible
()
@
patch
(
'setuptools.pep425tags.get_platform'
,
lambda
:
'linux_x86_64'
)
@
patch
(
'setuptools.glibc.have_compatible_glibc'
,
lambda
major
,
minor
:
True
)
@
patch
(
'sys.platform'
,
'linux2'
)
def
test_manylinux1_tag_is_first
(
self
):
"""
Test that the more specific tag manylinux1 comes first.
"""
groups
=
{}
for
pyimpl
,
abi
,
arch
in
pep425tags
.
get_supported
():
groups
.
setdefault
((
pyimpl
,
abi
),
[]).
append
(
arch
)
for
arches
in
groups
.
values
():
if
arches
==
[
'any'
]:
continue
# Expect the most specific arch first:
if
len
(
arches
)
==
3
:
assert
arches
==
[
'manylinux1_x86_64'
,
'linux_x86_64'
,
'any'
]
else
:
assert
arches
==
[
'manylinux1_x86_64'
,
'linux_x86_64'
]
setuptools/wheel.py
View file @
3d811b93
...
@@ -11,9 +11,9 @@ import zipfile
...
@@ -11,9 +11,9 @@ import zipfile
import
pkg_resources
import
pkg_resources
import
setuptools
import
setuptools
from
pkg_resources
import
parse_version
from
pkg_resources
import
parse_version
from
setuptools.extern.packaging.tags
import
sys_tags
from
setuptools.extern.packaging.utils
import
canonicalize_name
from
setuptools.extern.packaging.utils
import
canonicalize_name
from
setuptools.extern.six
import
PY3
from
setuptools.extern.six
import
PY3
from
setuptools
import
pep425tags
from
setuptools.command.egg_info
import
write_requirements
from
setuptools.command.egg_info
import
write_requirements
...
@@ -76,7 +76,7 @@ class Wheel:
...
@@ -76,7 +76,7 @@ class Wheel:
def is_compatible(self):
def is_compatible(self):
'''Is the wheel is compatible with the current platform?'''
'''Is the wheel is compatible with the current platform?'''
supported_tags =
pep425tags.get_supported(
)
supported_tags =
set(map(str, sys_tags())
)
return next((True for t in self.tags() if t in supported_tags), False)
return next((True for t in self.tags() if t in supported_tags), False)
def egg_name(self):
def egg_name(self):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment