Skip to content

Commit

Permalink
fix subdir loading (#382)
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfv committed Nov 17, 2023
1 parent 2d5d030 commit ac38810
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 3 deletions.
1 change: 1 addition & 0 deletions boa/core/solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ def __init__(self, channels, platform, output_folder=None):
self.output_folder = output_folder or "local"
self.pool = libmambapy.Pool()
self.repos = []

self.index = load_channels(
self.pool, self.channels, self.repos, platform=platform
)
Expand Down
17 changes: 15 additions & 2 deletions boa/core/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,23 @@ def fixup_channel_spec(spec):
channel, channel_platform, full_url, pkgs_dirs, repodata_fn
)

needs_finalising = sd.download_and_check_targets(dlist)
index.append(
(sd, {"platform": channel_platform, "url": url, "channel": channel})
(
sd,
{
"platform": channel_platform,
"url": url,
"channel": channel,
"needs_finalising": needs_finalising,
},
)
)
dlist.add(sd)

for sd, info in index:
if info["needs_finalising"]:
sd.finalize_checks()
dlist.add(sd)

is_downloaded = dlist.download(api.MAMBA_DOWNLOAD_FAILFAST)

Expand Down
2 changes: 1 addition & 1 deletion tests/env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- python>=3.7
- pip
- conda
- libmambapy <=1.4.2
- libmambapy >=1.5,<1.6
- pytest
- "conda-build>=3.20"
- ruamel
Expand Down

0 comments on commit ac38810

Please sign in to comment.