Skip to content

Commit b6978d8

Browse files
committed
move name normalization to parse_requirements
1 parent 957732a commit b6978d8

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

python/private/pypi/extension.bzl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,6 @@ def _create_whl_repos(
218218
)
219219

220220
for whl_name, requirements in requirements_by_platform.items():
221-
whl_name = normalize_name(whl_name)
222-
223221
group_name = whl_group_mapping.get(whl_name)
224222
group_deps = requirement_cycles.get(group_name, [])
225223

@@ -333,7 +331,7 @@ def _create_whl_repos(
333331
is_reproducible = is_reproducible,
334332
whl_map = whl_map,
335333
exposed_packages = {
336-
normalize_name(whl_name): None
334+
whl_name: None
337335
for whl_name, requirements in requirements_by_platform.items()
338336
if len([r for r in requirements if r.is_exposed]) > 0
339337
},

python/private/pypi/parse_requirements.bzl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,9 @@ def parse_requirements(
203203
sorted(requirements),
204204
))
205205

206+
# Return normalized names
207+
ret_requirements = ret.setdefault(normalize_name(whl_name), [])
208+
206209
for r in sorted(reqs.values(), key = lambda r: r.requirement_line):
207210
whls, sdist = _add_dists(
208211
requirement = r,
@@ -211,7 +214,7 @@ def parse_requirements(
211214
)
212215

213216
target_platforms = env_marker_target_platforms.get(r.requirement_line, r.target_platforms)
214-
ret.setdefault(whl_name, []).append(
217+
ret_requirements.append(
215218
struct(
216219
distribution = r.distribution,
217220
srcs = r.srcs,

0 commit comments

Comments
 (0)