Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion constructor/shar.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def create(info, verbose=False):
"pkgs/%s.sh" % key,
filter=make_executable if has_shebang(info[key]) else None,
)
cache_dir = join(tmp_dir, "cache")
cache_dir = join(tmp_dir, "pkgs", "cache")
if isdir(cache_dir):
for cf in os.listdir(cache_dir):
if cf.endswith(".json"):
Expand Down
19 changes: 19 additions & 0 deletions news/1121-repodata-cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
### Enhancements

* <news item>

### Bug fixes

* Ensure cached repodata files are shipped in SH installers. (#1119 via #1121).
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yikes, sounds like something to do a patch release for?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. Not really a critical breakage, but it's a regression.


### Deprecations

* <news item>

### Docs

* <news item>

### Other

* <news item>
3 changes: 3 additions & 0 deletions tests/test_examples.py
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,9 @@ def test_example_miniforge(tmp_path, request, example):
check_sentinels=installer.suffix != ".pkg",
uninstall=False,
)
# Check that key metadata files are in place
assert install_dir.glob("conda-meta/*.json")
assert install_dir.glob("pkgs/cache/*.json") # enables offline installs
if installer.suffix == ".pkg" and ON_CI:
basename = "Miniforge3" if example == "miniforge" else "Miniforge3-mamba2"
_sentinel_file_checks(input_path, Path(os.environ["HOME"]) / basename)
Expand Down
Loading