Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove old logic in SolverOutputState.prepare_specs() and apply enabled cleanups #381

Merged
merged 27 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
8ec6c53
remove dead code in state.py and dependents
jaimergp Nov 14, 2023
ff6e837
change default sorting of input specs
jaimergp Nov 14, 2023
ba3f9f9
strictest first
jaimergp Nov 14, 2023
4346bdf
pre-commit
jaimergp Nov 14, 2023
657ce04
cleanup logging
jaimergp Nov 14, 2023
e66846d
call check_for_pin_conflicts()
jaimergp Nov 15, 2023
1582b69
persist pins mapping
jaimergp Nov 15, 2023
4e2cd0f
Merge branch 'main' of github.com:conda/conda-libmamba-solver into cl…
jaimergp Nov 15, 2023
cc90da9
split .conda pkgs in installed records
jaimergp Nov 16, 2023
d1150b0
fix segfault
jaimergp Nov 16, 2023
d735723
amend durations path in test
jaimergp Nov 16, 2023
399fcfc
pre-commit
jaimergp Nov 16, 2023
f445aaf
amend tests that are now passing
jaimergp Nov 16, 2023
58beb64
Merge branch 'main' of github.com:conda/conda-libmamba-solver into cl…
jaimergp Nov 21, 2023
6b2a18b
add news
jaimergp Nov 21, 2023
4e66f6a
remove pytest workaround
jaimergp Nov 30, 2023
bb4df1b
readd but tuning the repodata cache key
jaimergp Nov 30, 2023
f35dd41
Merge branch 'main' into cleanup
jaimergp Dec 5, 2023
4e125a3
Update conda_libmamba_solver/solver.py
jezdez Dec 8, 2023
3793b4a
Update dev/linux/upstream_integration.sh
jezdez Dec 8, 2023
dd5d026
Update dev/linux/upstream_integration.sh
jezdez Dec 8, 2023
5229602
Merge branch '23.12.x' into cleanup
jaimergp Dec 11, 2023
05f1817
defend against non tuple keys
jaimergp Dec 11, 2023
1ea28bf
ensure installed_count > 0
jaimergp Dec 11, 2023
a550184
`max_attempts` should only use `n_installed` if >0 (#403)
jaimergp Dec 12, 2023
4986dca
Release 23.12.0 (#407)
jezdez Dec 12, 2023
eaf701f
Merge branch '23.12.x' into cleanup
jezdez Dec 19, 2023
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
11 changes: 6 additions & 5 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
email: jaimergp@users.noreply.github.com
aliases:
- jaimergp
num_commits: 118
num_commits: 122
first_commit: 2022-01-31 17:24:37
github: jaimergp
- name: Jannis Leidel
email: jannis@leidel.info
num_commits: 38
num_commits: 41
first_commit: 2022-02-17 14:48:48
github: jezdez
- name: pre-commit-ci[bot]
Expand All @@ -22,7 +22,7 @@
github: costrouc
- name: Daniel Holth
email: dholth@anaconda.com
num_commits: 2
num_commits: 3
first_commit: 2022-10-19 21:11:39
github: dholth
- name: Matthew R. Becker
Expand All @@ -34,7 +34,7 @@
email: 18747875+conda-bot@users.noreply.github.com
aliases:
- Conda Bot
num_commits: 24
num_commits: 26
first_commit: 2022-11-15 16:45:31
github: conda-bot
- name: Ken Odegard
Expand All @@ -54,5 +54,6 @@
first_commit: 2023-04-18 12:42:06
- name: Travis Hathaway
email: travis.j.hathaway@gmail.com
num_commits: 2
num_commits: 4
first_commit: 2023-11-10 15:58:32
github: travishathaway
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,30 @@ Remember to update the hyperlinks at the bottom.

[//]: # (current developments)

## 23.12.0 (2023-12-12)

### Enhancements

* Add some boundary checks to `CONDA_LIBMAMBA_SOLVER_MAX_ATTEMPTS`. (#394, #403)

### Bug fixes

* Instantiate `IndexHelper` in offline mode for compatibility with conda-build. Otherwise
the index can get out of sync during long build processes. (#386 via #395)

### Docs

* Use new conda-sphinx-theme for documentation site. (#367 via #370)
* Reorganize the layout of the documentation site. (#370)

### Contributors

* @dholth
* @jaimergp
* @jezdez
* @travishathaway made their first contribution in https://github.com/conda/conda-libmamba-solver/pull/370


## 23.11.1 (2023-11-16)

### Enhancements
Expand Down
15 changes: 10 additions & 5 deletions conda_libmamba_solver/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ def _repo_from_records(
This is done by rebuilding a repodata.json-like dictionary, which is
then exported to a temporary file that will be loaded with 'libmambapy.Repo'.
"""
exported = {"packages": {}}
exported = {"packages": {}, "packages.conda": {}}
additional_infos = {}
for record in records:
record_data = dict(record.dump())
Expand All @@ -201,7 +201,10 @@ def _repo_from_records(
if field == "timestamp" and value:
value = int(value * 1000) # from s to ms
record_data[field] = value
exported["packages"][record.fn] = record_data
if record.fn.endswith(".conda"):
exported["packages.conda"][record.fn] = record_data
else:
exported["packages"][record.fn] = record_data

# extra info for libmamba
info = api.ExtraPkgInfo()
Expand Down Expand Up @@ -229,9 +232,11 @@ def _fetch_channel(self, url: str) -> tuple[str, os.PathLike]:
if "PYTEST_CURRENT_TEST" in os.environ:
# Workaround some testing issues - TODO: REMOVE
# Fix conda.testing.helpers._patch_for_local_exports by removing last line
maybe_cached = SubdirData._cache_.get((url, self._repodata_fn))
if maybe_cached and maybe_cached._mtime == float("inf"):
del SubdirData._cache_[(url, self._repodata_fn)]
for key, cached in list(SubdirData._cache_.items()):
if not isinstance(key, tuple):
continue # should not happen, but avoid IndexError just in case
if key[:2] == (url, self._repodata_fn) and cached._mtime == float("inf"):
jezdez marked this conversation as resolved.
Show resolved Hide resolved
del SubdirData._cache_[key]
# /Workaround

log.debug("Fetching %s with SubdirData.repo_fetch", channel)
Expand Down
274 changes: 0 additions & 274 deletions conda_libmamba_solver/models.py

This file was deleted.

Loading
Loading