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
17 changes: 13 additions & 4 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
github: jaimergp
- name: Jannis Leidel
email: jannis@leidel.info
num_commits: 42
num_commits: 43
first_commit: 2022-02-17 14:48:48
github: jezdez
- name: pre-commit-ci[bot]
email: 66853113+pre-commit-ci[bot]@users.noreply.github.com
num_commits: 110
num_commits: 112
first_commit: 2022-11-22 08:39:31
github: pre-commit-ci[bot]
- name: Christopher Ostrouchov
Expand All @@ -22,7 +22,7 @@
github: costrouc
- name: Daniel Holth
email: dholth@anaconda.com
num_commits: 28
num_commits: 32
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: 101
num_commits: 103
first_commit: 2022-11-15 16:45:31
github: conda-bot
- name: Ken Odegard
Expand Down Expand Up @@ -106,3 +106,12 @@
num_commits: 1
first_commit: 2026-01-07 03:17:00
github: soapy1
- name: John Costa
email: costajohnt@gmail.com
github: costajohnt
num_commits: 1
first_commit: 2026-04-27 03:34:42
- name: Dan Yeaw
email: dan@yeaw.me
num_commits: 1
first_commit: 2026-05-01 18:41:55
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@
Agriya Khetarpal <74401230+agriyakhetarpal@users.noreply.github.com>
Albert DeFusco <albert.defusco+gh@me.com>
Christopher Ostrouchov <chris.ostrouchov@gmail.com>
Dan Yeaw <dan@yeaw.me>
Daniel Holth <dholth@anaconda.com>
Jaime Rodríguez-Guerra <jaimergp@users.noreply.github.com> jaimergp <jaimergp@users.noreply.github.com>
Jannis Leidel <jannis@leidel.info>
John Costa <costajohnt@gmail.com>
John Kirkham <jakirkham@gmail.com>
Jonathan J. Helmus <jjhelmus@gmail.com>
Julien Jerphanion <git@jjerphan.xyz>
Expand Down
2 changes: 2 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ Authors are sorted alphabetically.
* Agriya Khetarpal
* Albert DeFusco
* Christopher Ostrouchov
* Dan Yeaw
* Daniel Holth
* Jaime Rodríguez-Guerra
* Jannis Leidel
* John Costa
* John Kirkham
* Jonathan J. Helmus
* Julien Jerphanion
Expand Down
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,34 @@ Remember to update the hyperlinks at the bottom.

[//]: # (current developments)




## 26.4.1 (2026-05-01)

### Bug fixes

* Show the target platform instead of the host platform in the progress
message during cross-platform lockfile export. (#911)
* Open the sharded repodata cache (`repodata_shards.db`) in WAL mode with a
longer SQLite busy timeout, so the pipelined cache reader thread no longer
races with the network writer thread and raises
`sqlite3.OperationalError: database is locked`. Fall back to the default
journal mode on filesystems where WAL is not supported. (#924)
* Fix `add_pip_as_python_dependency` not being honored when sharded repodata
is enabled. (#918 via #929)

### Contributors

* @costajohnt made their first contribution in https://github.com/conda/conda-libmamba-solver/pull/911
* @danyeaw made their first contribution in https://github.com/conda/conda-libmamba-solver/pull/929
* @dholth
* @jezdez
* @conda-bot
* @pre-commit-ci[bot]



## 26.4.0 (2026-04-16)

### Enhancements
Expand Down
20 changes: 0 additions & 20 deletions news/911-cross-platform-export-display

This file was deleted.

20 changes: 0 additions & 20 deletions news/918-fix-add-pip-as-python-dependency-sharded

This file was deleted.

23 changes: 0 additions & 23 deletions news/924-fix-shards-db-locked

This file was deleted.