Skip to content

Commit 43834ad

Browse files
authored
Drop python 3.5 support (#261)
Python 3.5 reached its end-of-life, time to drop support. Repairing python 3.5 wheels is still supported.
1 parent 666349d commit 43834ad

File tree

11 files changed

+104
-133
lines changed

11 files changed

+104
-133
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ language: python
44

55
jobs:
66
include:
7-
- python: "3.5"
87
- python: "3.6"
98
- python: "3.7"
109
- python: "3.8"

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Installation
4545
4646
$ pip3 install auditwheel
4747
48-
It requires Python 3.5+, and runs on Linux. It requires that the shell command
48+
It requires Python 3.6+, and runs on Linux. It requires that the shell command
4949
``unzip`` be available in the ``PATH``. Only systems that use `ELF
5050
<https://en.wikipedia.org/wiki/Executable_and_Linkable_Format>`_-based linkage
5151
are supported (this should be essentially every Linux).
@@ -130,7 +130,7 @@ daemon. These tests will pull a number of docker images if they are not already
130130
available on your system, but it won't update existing images.
131131
To update these images manually, run::
132132

133-
docker pull python:3.5
133+
docker pull python:3.6
134134
docker pull quay.io/pypa/manylinux1_x86_64
135135
docker pull quay.io/pypa/manylinux2010_x86_64
136136
docker pull quay.io/pypa/manylinux2014_x86_64

auditwheel/policy/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
_PLATFORM_REPLACEMENT_MAP = {}
1616
for _policy in {'manylinux1', 'manylinux2010'}:
1717
for _arch in {'x86_64', 'i686'}:
18-
_key = '{}_{}'.format(_policy, _arch)
19-
_value = 'linux_{}'.format(_arch)
18+
_key = f'{_policy}_{_arch}'
19+
_value = f'linux_{_arch}'
2020
_PLATFORM_REPLACEMENT_MAP[_key] = [_value]
2121

2222
for _policy in {'manylinux2014'}:
2323
for _arch in {
2424
'x86_64', 'i686', 'aarch64', 'armv7l', 'ppc64', 'ppc64le', 's390x'
2525
}:
26-
_key = '{}_{}'.format(_policy, _arch)
27-
_value = 'linux_{}'.format(_arch)
26+
_key = f'{_policy}_{_arch}'
27+
_value = f'linux_{_arch}'
2828
_PLATFORM_REPLACEMENT_MAP[_key] = [_value]
2929

3030

auditwheel/repair.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,15 @@ def _is_valid_rpath(rpath: str,
183183
wheel_base_dir: str) -> bool:
184184
full_rpath_entry = _resolve_rpath_tokens(rpath, lib_dir)
185185
if not isabs(full_rpath_entry):
186-
logger.debug('rpath entry {} could not be resolved to an absolute '
187-
'path -- discarding it.'.format(rpath))
186+
logger.debug(f'rpath entry {rpath} could not be resolved to an '
187+
'absolute path -- discarding it.')
188188
return False
189189
elif not is_subdir(full_rpath_entry, wheel_base_dir):
190-
logger.debug('rpath entry {} points outside the wheel -- discarding '
191-
'it.'.format(rpath))
190+
logger.debug(f'rpath entry {rpath} points outside the wheel -- '
191+
'discarding it.')
192192
return False
193193
else:
194-
logger.debug('Preserved rpath entry {}'.format(rpath))
194+
logger.debug(f'Preserved rpath entry {rpath}')
195195
return True
196196

197197

@@ -207,6 +207,6 @@ def _resolve_rpath_tokens(rpath: str,
207207
'LIB': system_lib_dir,
208208
'PLATFORM': system_processor_type}
209209
for token, target in token_replacements.items():
210-
rpath = rpath.replace('${}'.format(token), target) # $TOKEN
211-
rpath = rpath.replace('${{{}}}'.format(token), target) # ${TOKEN}
210+
rpath = rpath.replace(f'${token}', target) # $TOKEN
211+
rpath = rpath.replace(f'${{{token}}}', target) # ${TOKEN}
212212
return rpath

setup.cfg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@ author = Robert T. McGibbon
66
author-email = [email protected]
77
summary = Cross-distribution Linux wheels
88
description-file = README.rst
9-
python_requires = >=3.5
9+
python_requires = >=3.6
1010
classifier =
1111
Development Status :: 4 - Beta
1212
Environment :: Console
1313
Intended Audience :: Developers
1414
License :: OSI Approved :: MIT License
1515
Operating System :: POSIX :: Linux
1616
Programming Language :: Python :: 3
17-
Programming Language :: Python :: 3.5
1817
Programming Language :: Python :: 3.6
1918
Programming Language :: Python :: 3.7
2019
Programming Language :: Python :: 3.8

tests/integration/internal_rpath/setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
packages=find_packages(),
1010
ext_modules=[
1111
Extension(
12-
'{}.example_a'.format(package_name),
12+
f'{package_name}.example_a',
1313
['src/example_a.pyx'],
1414
include_dirs=['lib-src/a'],
1515
library_dirs=[package_name],
1616
libraries=['a'],
1717
extra_link_args=['-Wl,-rpath,$ORIGIN'],
1818
),
1919
Extension(
20-
'{}.example_b'.format(package_name),
20+
f'{package_name}.example_b',
2121
['src/example_b.pyx'],
2222
include_dirs=['lib-src/b'],
2323
library_dirs=['lib-src/b'],

0 commit comments

Comments
 (0)