Skip to content

Commit 306fa65

Browse files
committed
Upgrade flake8 to 3.8.1
Co-Authored-By: <Anthony Sottile [email protected]>
1 parent d0ab9bd commit 306fa65

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ repos:
1717
exclude: .patch
1818

1919
- repo: https://gitlab.com/pycqa/flake8
20-
rev: 3.7.9
20+
rev: 3.8.1
2121
hooks:
2222
- id: flake8
2323
exclude: tests/data

news/0FD33C4F-0B92-427D-AE3B-93EE33E15621.trivial

Whitespace-only changes.

src/pip/_internal/commands/show.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def get_requiring_packages(package_name):
9999
# RECORDs should be part of .dist-info metadatas
100100
if dist.has_metadata('RECORD'):
101101
lines = dist.get_metadata_lines('RECORD')
102-
paths = [l.split(',')[0] for l in lines]
102+
paths = [line.split(',')[0] for line in lines]
103103
paths = [os.path.join(dist.location, p) for p in paths]
104104
file_list = [os.path.relpath(p, dist.location) for p in paths]
105105

src/pip/_internal/operations/install/wheel.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,21 @@
3232
from pip._internal.utils.filesystem import adjacent_tmp_file, replace
3333
from pip._internal.utils.misc import captured_stdout, ensure_dir, hash_file
3434
from pip._internal.utils.temp_dir import TempDirectory
35-
from pip._internal.utils.typing import MYPY_CHECK_RUNNING, cast
35+
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
3636
from pip._internal.utils.unpacking import current_umask, unpack_file
3737
from pip._internal.utils.wheel import parse_wheel
3838

39-
if MYPY_CHECK_RUNNING:
39+
# Use the custom cast function at runtime to make cast work,
40+
# and import typing.cast when performing pre-commit and type
41+
# checks
42+
if not MYPY_CHECK_RUNNING:
43+
from pip._internal.utils.typing import cast
44+
else:
4045
from email.message import Message
4146
import typing # noqa F401
4247
from typing import (
4348
Dict, List, Optional, Sequence, Tuple, Any,
44-
Iterable, Iterator, Callable, Set,
49+
Iterable, Iterator, Callable, Set, IO, cast
4550
)
4651

4752
from pip._internal.models.scheme import Scheme
@@ -607,7 +612,7 @@ def _generate_file(path, **kwargs):
607612
# Python 2 (typing.BinaryIO), leading us to explicitly
608613
# cast to typing.IO[str] as a workaround
609614
# for bad Python 2 behaviour
610-
record_file_obj = cast('typing.IO[str]', record_file)
615+
record_file_obj = cast('IO[str]', record_file)
611616

612617
writer = csv.writer(record_file_obj)
613618
writer.writerows(sorted_outrows(rows)) # sort to simplify testing

src/pip/_internal/utils/misc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ class FakeFile(object):
541541
"""Wrap a list of lines in an object with readline() to make
542542
ConfigParser happy."""
543543
def __init__(self, lines):
544-
self._gen = (l for l in lines)
544+
self._gen = iter(lines)
545545

546546
def readline(self):
547547
try:

src/pip/_internal/wheel_builder.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636

3737

3838
def _contains_egg_info(
39-
s, _egg_info_re=re.compile(r'([a-z0-9_.]+)-([a-z0-9_.!+-]+)', re.I)):
39+
s, _egg_info_re=re.compile(r'([a-z0-9_.]+)-([a-z0-9_.!+-]+)',
40+
re.IGNORECASE)):
4041
# type: (str, Pattern[str]) -> bool
4142
"""Determine whether the string looks like an egg_info.
4243

tests/functional/test_install_reqs.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def test_install_with_extras_from_install(script, data):
420420
)
421421
result = script.pip_install_local(
422422
'-c', script.scratch_path / 'constraints.txt', 'LocalExtras[baz]')
423-
assert script.site_packages / 'singlemodule.py'in result.files_created
423+
assert script.site_packages / 'singlemodule.py' in result.files_created
424424

425425

426426
def test_install_with_extras_joined(script, data):
@@ -432,7 +432,7 @@ def test_install_with_extras_joined(script, data):
432432
'-c', script.scratch_path / 'constraints.txt', 'LocalExtras[baz]'
433433
)
434434
assert script.site_packages / 'simple' in result.files_created
435-
assert script.site_packages / 'singlemodule.py'in result.files_created
435+
assert script.site_packages / 'singlemodule.py' in result.files_created
436436

437437

438438
def test_install_with_extras_editable_joined(script, data):
@@ -443,7 +443,7 @@ def test_install_with_extras_editable_joined(script, data):
443443
result = script.pip_install_local(
444444
'-c', script.scratch_path / 'constraints.txt', 'LocalExtras[baz]')
445445
assert script.site_packages / 'simple' in result.files_created
446-
assert script.site_packages / 'singlemodule.py'in result.files_created
446+
assert script.site_packages / 'singlemodule.py' in result.files_created
447447

448448

449449
def test_install_distribution_full_union(script, data):

0 commit comments

Comments
 (0)