Skip to content

Commit 7194c15

Browse files
committed
Replace normalize_name with canonicalize_name
Per @dims: pip removed some of the code find_missing_reqs.pya needed pypa/pip@8c67bcc#diff-ab583908279e865537dec218246edcfc So pip_check_reqs fails with latest pip versions This commit replaces it with `canonicalize_name` from the _packaging_ distribution.
1 parent 15ef3cd commit 7194c15

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

pip_check_reqs/common.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import os
66
import re
77

8+
from packaging.utils import canonicalize_name
89
from pip.download import PipSession
910
from pip.req import parse_requirements
10-
from pip.utils import normalize_name
1111

1212
log = logging.getLogger(__name__)
1313

@@ -129,7 +129,7 @@ def find_required_modules(options):
129129
log.debug('ignoring requirement: %s', requirement.name)
130130
else:
131131
log.debug('found requirement: %s', requirement.name)
132-
explicit.add(normalize_name(requirement.name))
132+
explicit.add(canonicalize_name(requirement.name))
133133
return explicit
134134

135135

pip_check_reqs/find_extra_reqs.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
import os
55
import sys
66

7+
from packaging.utils import canonicalize_name
78
from pip.commands.show import search_packages_info
8-
from pip.utils import get_installed_distributions, normalize_name
9+
from pip.utils import get_installed_distributions
910

1011
from pip_check_reqs import common
1112

@@ -38,7 +39,7 @@ def find_extra_reqs(options):
3839
for modname, info in used_modules.items():
3940
# probably standard library if it's not in the files list
4041
if info.filename in installed_files:
41-
used_name = normalize_name(installed_files[info.filename])
42+
used_name = canonicalize_name(installed_files[info.filename])
4243
log.debug('used module: %s (from package %s)', modname,
4344
installed_files[info.filename])
4445
used[used_name].append(info)

pip_check_reqs/find_missing_reqs.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
import os
55
import sys
66

7+
from packaging.utils import canonicalize_name
78
from pip.commands.show import search_packages_info
89
from pip.download import PipSession
910
from pip.req import parse_requirements
10-
from pip.utils import get_installed_distributions, normalize_name
11+
from pip.utils import get_installed_distributions
1112

1213
from pip_check_reqs import common
1314

@@ -40,7 +41,7 @@ def find_missing_reqs(options):
4041
for modname, info in used_modules.items():
4142
# probably standard library if it's not in the files list
4243
if info.filename in installed_files:
43-
used_name = normalize_name(installed_files[info.filename])
44+
used_name = canonicalize_name(installed_files[info.filename])
4445
log.debug('used module: %s (from package %s)', modname,
4546
installed_files[info.filename])
4647
used[used_name].append(info)
@@ -54,7 +55,7 @@ def find_missing_reqs(options):
5455
for requirement in parse_requirements('requirements.txt',
5556
session=PipSession()):
5657
log.debug('found requirement: %s', requirement.name)
57-
explicit.add(normalize_name(requirement.name))
58+
explicit.add(canonicalize_name(requirement.name))
5859

5960
return [(name, used[name]) for name in used
6061
if name not in explicit]

setup.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,8 @@
3838
'pip-extra-reqs=pip_check_reqs.find_extra_reqs:main',
3939
],
4040
},
41+
install_requires=[
42+
'packaging',
43+
'pip',
44+
],
4145
)

0 commit comments

Comments
 (0)