Skip to content

Commit

Permalink
Fix small issue with injection of sys packages
Browse files Browse the repository at this point in the history
  • Loading branch information
romain-intel committed Dec 13, 2023
1 parent 4a49c09 commit 2bf1495
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ def resolve(
]
for p, v in sys_pkgs.items():
if p not in new_sys_deps:
deps["sys"].append("%s==%s" % (p, v) if p else p)
deps["sys"].append("%s==%s" % (p, v) if v else p)

# We add the default sources as well -- those sources go last and we convert
# to simple channels if we can
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -568,8 +568,6 @@ def extract_merged_reqs_for_step(
get_pinned_conda_libs(final_req.python, datastore_type),
)

final_req.packages = all_packages

# Add the system requirements and default channels.
# The default channels go into the computation of the req ID so it is important
# to have them at this time.
Expand All @@ -580,11 +578,13 @@ def extract_merged_reqs_for_step(

# The user can specify whatever they want but we inject things they don't
# specify
final_req_sys = final_req.packages.setdefault("sys", {})
final_req_sys = all_packages.setdefault("sys", {})
for p, v in sys_pkgs.items():
if p not in final_req_sys:
final_req_sys[p] = v

final_req.packages = all_packages

# Update sources -- here the order is important so we explicitly set it
# This code will put:
# - unique conda sources using user sources *first*
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
netflixext_version = "1.1.0"
netflixext_version = "1.1.1"

0 comments on commit 2bf1495

Please sign in to comment.