Skip to content

Commit

Permalink
Merge branch 'mr/adjust_egg_support' into 'master'
Browse files Browse the repository at this point in the history
Pypi-closure computation fixed

See merge request it/e3-core!31
  • Loading branch information
Nikokrock committed Aug 16, 2024
2 parents 96af400 + 9f8cf48 commit 97b22a6
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions src/e3/python/pypi.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def fetch_candidates(
for link in project_links:
try:
c = PyPICandidate(
identifier=identifier,
identifier=identifier.split("@", 1)[0],
link=link,
extras=extras,
cache_dir=os.path.join(self.cache_dir, "resources"),
Expand Down Expand Up @@ -379,9 +379,14 @@ def requirements(self, env: dict[str, str]) -> set[Requirement]:
elif line and not line.startswith("#"):
# Non empty lines that are not comments should be
# considered as requirements
self._reqs.add(
Requirement(f"{line};{current_marker}")
)
if current_marker:
self._reqs.add(
Requirement(f"{line};{current_marker}")
)
else:
# Don't emit a final ; if the marker is empty
# as this is not accepted by the syntax
self._reqs.add(Requirement(line))

elif requirements_txt in archive_members:
# Check if there is a requirements.txt (this is a fallback)
Expand Down

0 comments on commit 97b22a6

Please sign in to comment.