Skip to content

Drop python 3.5 support #261

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

Merged
merged 1 commit into from
Sep 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ language: python

jobs:
include:
- python: "3.5"
- python: "3.6"
- python: "3.7"
- python: "3.8"
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Installation

$ pip3 install auditwheel

It requires Python 3.5+, and runs on Linux. It requires that the shell command
It requires Python 3.6+, and runs on Linux. It requires that the shell command
``unzip`` be available in the ``PATH``. Only systems that use `ELF
<https://en.wikipedia.org/wiki/Executable_and_Linkable_Format>`_-based linkage
are supported (this should be essentially every Linux).
Expand Down Expand Up @@ -130,7 +130,7 @@ daemon. These tests will pull a number of docker images if they are not already
available on your system, but it won't update existing images.
To update these images manually, run::

docker pull python:3.5
docker pull python:3.6
docker pull quay.io/pypa/manylinux1_x86_64
docker pull quay.io/pypa/manylinux2010_x86_64
docker pull quay.io/pypa/manylinux2014_x86_64
Expand Down
8 changes: 4 additions & 4 deletions auditwheel/policy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@
_PLATFORM_REPLACEMENT_MAP = {}
for _policy in {'manylinux1', 'manylinux2010'}:
for _arch in {'x86_64', 'i686'}:
_key = '{}_{}'.format(_policy, _arch)
_value = 'linux_{}'.format(_arch)
_key = f'{_policy}_{_arch}'
_value = f'linux_{_arch}'
_PLATFORM_REPLACEMENT_MAP[_key] = [_value]

for _policy in {'manylinux2014'}:
for _arch in {
'x86_64', 'i686', 'aarch64', 'armv7l', 'ppc64', 'ppc64le', 's390x'
}:
_key = '{}_{}'.format(_policy, _arch)
_value = 'linux_{}'.format(_arch)
_key = f'{_policy}_{_arch}'
_value = f'linux_{_arch}'
_PLATFORM_REPLACEMENT_MAP[_key] = [_value]


Expand Down
14 changes: 7 additions & 7 deletions auditwheel/repair.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,15 +183,15 @@ def _is_valid_rpath(rpath: str,
wheel_base_dir: str) -> bool:
full_rpath_entry = _resolve_rpath_tokens(rpath, lib_dir)
if not isabs(full_rpath_entry):
logger.debug('rpath entry {} could not be resolved to an absolute '
'path -- discarding it.'.format(rpath))
logger.debug(f'rpath entry {rpath} could not be resolved to an '
'absolute path -- discarding it.')
return False
elif not is_subdir(full_rpath_entry, wheel_base_dir):
logger.debug('rpath entry {} points outside the wheel -- discarding '
'it.'.format(rpath))
logger.debug(f'rpath entry {rpath} points outside the wheel -- '
'discarding it.')
return False
else:
logger.debug('Preserved rpath entry {}'.format(rpath))
logger.debug(f'Preserved rpath entry {rpath}')
return True


Expand All @@ -207,6 +207,6 @@ def _resolve_rpath_tokens(rpath: str,
'LIB': system_lib_dir,
'PLATFORM': system_processor_type}
for token, target in token_replacements.items():
rpath = rpath.replace('${}'.format(token), target) # $TOKEN
rpath = rpath.replace('${{{}}}'.format(token), target) # ${TOKEN}
rpath = rpath.replace(f'${token}', target) # $TOKEN
rpath = rpath.replace(f'${{{token}}}', target) # ${TOKEN}
return rpath
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ author = Robert T. McGibbon
author-email = [email protected]
summary = Cross-distribution Linux wheels
description-file = README.rst
python_requires = >=3.5
python_requires = >=3.6
classifier =
Development Status :: 4 - Beta
Environment :: Console
Intended Audience :: Developers
License :: OSI Approved :: MIT License
Operating System :: POSIX :: Linux
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/internal_rpath/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
packages=find_packages(),
ext_modules=[
Extension(
'{}.example_a'.format(package_name),
f'{package_name}.example_a',
['src/example_a.pyx'],
include_dirs=['lib-src/a'],
library_dirs=[package_name],
libraries=['a'],
extra_link_args=['-Wl,-rpath,$ORIGIN'],
),
Extension(
'{}.example_b'.format(package_name),
f'{package_name}.example_b',
['src/example_b.pyx'],
include_dirs=['lib-src/b'],
library_dirs=['lib-src/b'],
Expand Down
Loading