Skip to content

Commit

Permalink
Merge 25.1.x back into main (#5586)
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard authored Jan 14, 2025
2 parents 0e15d18 + b713677 commit 022cb23
Show file tree
Hide file tree
Showing 13 changed files with 71 additions and 162 deletions.
31 changes: 24 additions & 7 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1121,7 +1121,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 27
num_commits: 29
first_commit: 2019-10-17 23:05:16
github: beckermr
- name: Jinzhe Zeng
Expand Down Expand Up @@ -1240,7 +1240,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 95
num_commits: 100
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: [email protected]
Expand All @@ -1262,7 +1262,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 66
num_commits: 68
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: [email protected]
Expand Down Expand Up @@ -1310,7 +1310,7 @@
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
github: dependabot[bot]
num_commits: 37
num_commits: 38
first_commit: 2022-05-31 04:34:40
- name: Serhii Kupriienko
email: [email protected]
Expand All @@ -1327,7 +1327,7 @@
- name: Jaime Rodríguez-Guerra
email: [email protected]
github: jaimergp
num_commits: 20
num_commits: 23
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: [email protected]
Expand Down Expand Up @@ -1356,7 +1356,7 @@
github: xileF1337
- name: T Coxon
email: [email protected]
num_commits: 1
num_commits: 2
first_commit: 2023-02-24 01:34:03
github: tttc3
- name: Peet Whittaker
Expand Down Expand Up @@ -1466,11 +1466,28 @@
github: zklaus
- name: Daniel Ching
email: [email protected]
num_commits: 1
alternate_emails:
- [email protected]
num_commits: 2
first_commit: 2024-06-07 11:14:31
github: carterbox
- name: Cornelius Roemer
email: [email protected]
github: corneliusroemer
num_commits: 1
first_commit: 2024-11-26 11:16:47
- name: Tony Kelman
email: [email protected]
github: tkelman
num_commits: 1
first_commit: 2025-01-08 09:50:24
- name: Yoann Cédric Pradat
email: [email protected]
github: ypradat
num_commits: 1
first_commit: 2024-12-09 17:52:40
- name: Mahe Iram Khan
email: [email protected]
github: ForgottenProgramme
num_commits: 6
first_commit: 2025-01-13 18:15:05
5 changes: 4 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Dan Blanchard <[email protected]> Dan Blanchard <[email protected]>
Dan Blanchard <[email protected]> Dan Blanchard <[email protected]>
Dan Lovell <[email protected]> dlovell <[email protected]>
Daniel Bast <[email protected]>
Daniel Ching <[email protected]>
Daniel Ching <[email protected]> Daniel Ching <[email protected]>
Daniel Damiani <[email protected]>
Daniel Holth <[email protected]>
Daniel Petry <[email protected]> danpetry <[email protected]>
Expand Down Expand Up @@ -159,6 +159,7 @@ Lennart Fricke <[email protected]>
Levi Naden <[email protected]>
Lori Burns <[email protected]>
Lukas Schrangl <[email protected]>
Mahe Iram Khan <[email protected]>
Mandeep Bhutani <[email protected]> mandeep <[email protected]>
Mandeep Bhutani <[email protected]> mandeep <[email protected]>
Mandeep Bhutani <[email protected]> Mandeep Bhutani <[email protected]>
Expand Down Expand Up @@ -270,6 +271,7 @@ Todd Tomashek <[email protected]> todd.m.tomashek <todd.m.tomashek@intel
Tom Davidson <[email protected]>
Tom Pollard <[email protected]>
Tom Schoonjans <[email protected]>
Tony Kelman <[email protected]>
Toon Verstraelen <[email protected]>
Travis Hathaway <[email protected]>
Travis Oliphant <[email protected]> Travis E. Oliphant <[email protected]>
Expand All @@ -285,6 +287,7 @@ Wolf Vollprecht <[email protected]>
Wolfgang Ulmer <[email protected]>
Yann <[email protected]>
Yannik Tausch <[email protected]>
Yoann Cédric Pradat <[email protected]>
Yoav Ram <[email protected]>
Yu Feng <[email protected]>
Zane Dufour <[email protected]> zdog234 <[email protected]>
Expand Down
3 changes: 3 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
version: 2

sphinx:
configuration: docs/source/conf.py

build:
os: ubuntu-22.04
tools:
Expand Down
3 changes: 3 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ Authors are sorted alphabetically.
* Levi Naden
* Lori Burns
* Lukas Schrangl
* Mahe Iram Khan
* Mandeep Bhutani
* Marcel Bargull
* Marcelo Duarte Trevisani
Expand Down Expand Up @@ -227,6 +228,7 @@ Authors are sorted alphabetically.
* Tom Davidson
* Tom Pollard
* Tom Schoonjans
* Tony Kelman
* Toon Verstraelen
* Travis Hathaway
* Travis Oliphant
Expand All @@ -242,6 +244,7 @@ Authors are sorted alphabetically.
* Wolfgang Ulmer
* Yann
* Yannik Tausch
* Yoann Cédric Pradat
* Yoav Ram
* Yu Feng
* Zane Dufour
Expand Down
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,42 @@
[//]: # (current developments)

## 25.1.0 (2025-01-13)

### Enhancements

* Add SHA224, SHA384 and SHA512 support for validating downloaded sources. (#4793)
* Add new hashing methods (`content_sha256`, `content_sha384`, `content_sha512`) to calculate the
checksum of the extracted contents of the downloaded source artifacts. (#4821 via #5277)
* Make `.conda` the new default package format. `.tar.bz2` files can still be generated with `--package-format=1` and/or `conda_build.pkg_format: 1` in your `.condarc` file. (#5183 via #5527)
* Add compatibility for LIEF=0.15. (#5564 via #5565)

### Bug fixes

* Verify all source hashes when multiple are defined (not just the first one). (#4793)
* Fix a bug where some ``CondaBuildUserError`` exceptions that were formally ``SystemExit`` exceptions
were not being caught properly. (#5538)
* Fix a bug where bad match specs from intermediate parsing results would cause parsing to fail. (#5555)
* Fix `KeyError` when an inconsistent `build.pkg_type` value is specified in `meta.yaml`. (#5560)

### Other

* Demote logging message about glob finding no matches from error to warning (#5472)

### Contributors

* @conda-bot
* @carterbox
* @jaimergp
* @ForgottenProgramme
* @beckermr
* @tttc3
* @tkelman made their first contribution in https://github.com/conda/conda-build/pull/5565
* @ypradat made their first contribution in https://github.com/conda/conda-build/pull/5560
* @dependabot[bot]
* @pre-commit-ci[bot]



## 24.11.2 (2024-11-26)

### Bug fixes
Expand Down
19 changes: 0 additions & 19 deletions news/4793-support-sha224-sha384-and-sha512

This file was deleted.

20 changes: 0 additions & 20 deletions news/5277-content-hash

This file was deleted.

19 changes: 0 additions & 19 deletions news/5472-demote-non-mathing-glob-to-warning

This file was deleted.

19 changes: 0 additions & 19 deletions news/5527-dot-conda-default

This file was deleted.

20 changes: 0 additions & 20 deletions news/5538-sysexit-vs-cdusererror

This file was deleted.

19 changes: 0 additions & 19 deletions news/5555-skip-bad-specs-while-still-parsing.rst

This file was deleted.

19 changes: 0 additions & 19 deletions news/5560-fix-pkg-type-key-error

This file was deleted.

19 changes: 0 additions & 19 deletions news/5565-lief-0.15-compat

This file was deleted.

0 comments on commit 022cb23

Please sign in to comment.