From 15e59e6be5a0d47f5b57f7587fe082cb47b2e351 Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:15:05 +0100 Subject: [PATCH 1/9] Update .authors.yml --- .authors.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.authors.yml b/.authors.yml index e2eb67663e..a9331ab6ec 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1121,7 +1121,7 @@ alternate_emails: - becker.mr@gmail.com - beckermr@users.noreply.github.com - num_commits: 27 + num_commits: 29 first_commit: 2019-10-17 23:05:16 github: beckermr - name: Jinzhe Zeng @@ -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: jacobtylerwalls@gmail.com @@ -1262,7 +1262,7 @@ alternate_emails: - ad-team+condabot@anaconda.com - 18747875+conda-bot@users.noreply.github.com - num_commits: 66 + num_commits: 68 first_commit: 2022-01-17 18:09:22 - name: Uwe L. Korn email: xhochy@users.noreply.github.com @@ -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: 79282962+skupr-anaconda@users.noreply.github.com @@ -1327,7 +1327,7 @@ - name: Jaime Rodríguez-Guerra email: jaimergp@users.noreply.github.com github: jaimergp - num_commits: 20 + num_commits: 23 first_commit: 2022-11-02 19:34:51 - name: Dave Clements email: tnabtaf@gmail.com @@ -1356,7 +1356,7 @@ github: xileF1337 - name: T Coxon email: 97948946+tttc3@users.noreply.github.com - num_commits: 1 + num_commits: 2 first_commit: 2023-02-24 01:34:03 github: tttc3 - name: Peet Whittaker @@ -1466,7 +1466,9 @@ github: zklaus - name: Daniel Ching email: carterbox@users.noreply.github.com - num_commits: 1 + alternate_emails: + - 9604511+carterbox@users.noreply.github.com + num_commits: 2 first_commit: 2024-06-07 11:14:31 github: carterbox - name: Cornelius Roemer @@ -1474,3 +1476,13 @@ github: corneliusroemer num_commits: 1 first_commit: 2024-11-26 11:16:47 +- name: Tony Kelman + email: tony@kelman.net + github: tkelman + num_commits: 1 + first_commit: 2025-01-08 09:50:24 +- name: Yoann Cédric Pradat + email: yoannpradat@live.fr + github: ypradat + num_commits: 1 + first_commit: 2024-12-09 17:52:40 From f47a53aefa65cfc5b9ffa2cbc4203420dec97fd5 Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:16:50 +0100 Subject: [PATCH 2/9] Update .mailmap --- .mailmap | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index b75caa38d0..c7e01b4368 100644 --- a/.mailmap +++ b/.mailmap @@ -69,7 +69,7 @@ Dan Blanchard Dan Blanchard Dan Blanchard Dan Blanchard Dan Lovell dlovell Daniel Bast <2790401+dbast@users.noreply.github.com> -Daniel Ching +Daniel Ching Daniel Ching <9604511+carterbox@users.noreply.github.com> Daniel Damiani Daniel Holth Daniel Petry danpetry @@ -159,6 +159,7 @@ Lennart Fricke Levi Naden Lori Burns Lukas Schrangl +Mahe Iram Khan Mandeep Bhutani mandeep Mandeep Bhutani mandeep Mandeep Bhutani Mandeep Bhutani @@ -270,6 +271,7 @@ Todd Tomashek todd.m.tomashek Tom Pollard Tom Schoonjans +Tony Kelman Toon Verstraelen Travis Hathaway Travis Oliphant Travis E. Oliphant @@ -285,6 +287,7 @@ Wolf Vollprecht Wolfgang Ulmer Yann Yannik Tausch +Yoann Cédric Pradat Yoav Ram Yu Feng Zane Dufour zdog234 From 5f9e56ae30032806b3a65220f6093658274a7961 Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:17:43 +0100 Subject: [PATCH 3/9] Update news --- news/4793-support-sha224-sha384-and-sha512 | 2 +- news/5472-demote-non-mathing-glob-to-warning | 2 +- news/5538-sysexit-vs-cdusererror | 2 +- news/5555-skip-bad-specs-while-still-parsing.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/news/4793-support-sha224-sha384-and-sha512 b/news/4793-support-sha224-sha384-and-sha512 index efc63160a9..8ba78a0ff2 100644 --- a/news/4793-support-sha224-sha384-and-sha512 +++ b/news/4793-support-sha224-sha384-and-sha512 @@ -1,6 +1,6 @@ ### Enhancements -* Added SHA224, SHA384 and SHA512 support for validating downloaded sources. (#4793) +* Add SHA224, SHA384 and SHA512 support for validating downloaded sources. (#4793) ### Bug fixes diff --git a/news/5472-demote-non-mathing-glob-to-warning b/news/5472-demote-non-mathing-glob-to-warning index 17e2a93ff8..6f9ac42704 100644 --- a/news/5472-demote-non-mathing-glob-to-warning +++ b/news/5472-demote-non-mathing-glob-to-warning @@ -16,4 +16,4 @@ ### Other -* Demoted logging message about glob finding no matches from error to warning (#5472) +* Demote logging message about glob finding no matches from error to warning (#5472) diff --git a/news/5538-sysexit-vs-cdusererror b/news/5538-sysexit-vs-cdusererror index b01e596601..cf973b9d54 100644 --- a/news/5538-sysexit-vs-cdusererror +++ b/news/5538-sysexit-vs-cdusererror @@ -4,7 +4,7 @@ ### Bug fixes -* Fixed a bug where some ``CondaBuildUserError`` exceptions that were formally ``SystemExit`` exceptions +* Fix a bug where some ``CondaBuildUserError`` exceptions that were formally ``SystemExit`` exceptions were not being caught properly. (#5538) ### Deprecations diff --git a/news/5555-skip-bad-specs-while-still-parsing.rst b/news/5555-skip-bad-specs-while-still-parsing.rst index 1454fb9bad..3f78d6c549 100644 --- a/news/5555-skip-bad-specs-while-still-parsing.rst +++ b/news/5555-skip-bad-specs-while-still-parsing.rst @@ -4,7 +4,7 @@ ### Bug fixes -* Fixed a bug where bad match specs from intermediate parsing results would cause parsing to fail. (#5555) +* Fix a bug where bad match specs from intermediate parsing results would cause parsing to fail. (#5555) ### Deprecations From b962219984ca296871092808523d21a805d4746a Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:19:33 +0100 Subject: [PATCH 4/9] Updated authorship for 25.1.0 --- .authors.yml | 4 ++++ AUTHORS.md | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.authors.yml b/.authors.yml index a9331ab6ec..0ebe165ae6 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1486,3 +1486,7 @@ github: ypradat num_commits: 1 first_commit: 2024-12-09 17:52:40 +- name: Mahe Iram Khan + email: forgotten.programme@gmail.com + num_commits: 3 + first_commit: 2025-01-13 18:15:05 diff --git a/AUTHORS.md b/AUTHORS.md index 3adbcbe823..17e2eba3cc 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -138,6 +138,7 @@ Authors are sorted alphabetically. * Levi Naden * Lori Burns * Lukas Schrangl +* Mahe Iram Khan * Mandeep Bhutani * Marcel Bargull * Marcelo Duarte Trevisani @@ -227,6 +228,7 @@ Authors are sorted alphabetically. * Tom Davidson * Tom Pollard * Tom Schoonjans +* Tony Kelman * Toon Verstraelen * Travis Hathaway * Travis Oliphant @@ -242,6 +244,7 @@ Authors are sorted alphabetically. * Wolfgang Ulmer * Yann * Yannik Tausch +* Yoann Cédric Pradat * Yoav Ram * Yu Feng * Zane Dufour From 99ab5ae39c8de5d95b10bfd515c9024a499e3275 Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:20:14 +0100 Subject: [PATCH 5/9] Updated authorship for 25.1.0 --- .authors.yml | 3 ++- news/4793-support-sha224-sha384-and-sha512 | 19 ------------------ news/5277-content-hash | 20 ------------------- news/5472-demote-non-mathing-glob-to-warning | 19 ------------------ news/5527-dot-conda-default | 19 ------------------ news/5538-sysexit-vs-cdusererror | 20 ------------------- ...555-skip-bad-specs-while-still-parsing.rst | 19 ------------------ news/5560-fix-pkg-type-key-error | 19 ------------------ news/5565-lief-0.15-compat | 19 ------------------ 9 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 news/4793-support-sha224-sha384-and-sha512 delete mode 100644 news/5277-content-hash delete mode 100644 news/5472-demote-non-mathing-glob-to-warning delete mode 100644 news/5527-dot-conda-default delete mode 100644 news/5538-sysexit-vs-cdusererror delete mode 100644 news/5555-skip-bad-specs-while-still-parsing.rst delete mode 100644 news/5560-fix-pkg-type-key-error delete mode 100644 news/5565-lief-0.15-compat diff --git a/.authors.yml b/.authors.yml index 0ebe165ae6..15ea11e645 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1488,5 +1488,6 @@ first_commit: 2024-12-09 17:52:40 - name: Mahe Iram Khan email: forgotten.programme@gmail.com - num_commits: 3 + github: ForgottenProgramme + num_commits: 4 first_commit: 2025-01-13 18:15:05 diff --git a/news/4793-support-sha224-sha384-and-sha512 b/news/4793-support-sha224-sha384-and-sha512 deleted file mode 100644 index 8ba78a0ff2..0000000000 --- a/news/4793-support-sha224-sha384-and-sha512 +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Add SHA224, SHA384 and SHA512 support for validating downloaded sources. (#4793) - -### Bug fixes - -* Verify all source hashes when multiple are defined (not just the first one). (#4793) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5277-content-hash b/news/5277-content-hash deleted file mode 100644 index c1fc09c742..0000000000 --- a/news/5277-content-hash +++ /dev/null @@ -1,20 +0,0 @@ -### Enhancements - -* 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) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5472-demote-non-mathing-glob-to-warning b/news/5472-demote-non-mathing-glob-to-warning deleted file mode 100644 index 6f9ac42704..0000000000 --- a/news/5472-demote-non-mathing-glob-to-warning +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* Demote logging message about glob finding no matches from error to warning (#5472) diff --git a/news/5527-dot-conda-default b/news/5527-dot-conda-default deleted file mode 100644 index 30e9c229ba..0000000000 --- a/news/5527-dot-conda-default +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* 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) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5538-sysexit-vs-cdusererror b/news/5538-sysexit-vs-cdusererror deleted file mode 100644 index cf973b9d54..0000000000 --- a/news/5538-sysexit-vs-cdusererror +++ /dev/null @@ -1,20 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix a bug where some ``CondaBuildUserError`` exceptions that were formally ``SystemExit`` exceptions - were not being caught properly. (#5538) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5555-skip-bad-specs-while-still-parsing.rst b/news/5555-skip-bad-specs-while-still-parsing.rst deleted file mode 100644 index 3f78d6c549..0000000000 --- a/news/5555-skip-bad-specs-while-still-parsing.rst +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix a bug where bad match specs from intermediate parsing results would cause parsing to fail. (#5555) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5560-fix-pkg-type-key-error b/news/5560-fix-pkg-type-key-error deleted file mode 100644 index 19ca33c226..0000000000 --- a/news/5560-fix-pkg-type-key-error +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix `KeyError` when an inconsistent `build.pkg_type` value is specified in `meta.yaml`. (#5560) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5565-lief-0.15-compat b/news/5565-lief-0.15-compat deleted file mode 100644 index e69f971430..0000000000 --- a/news/5565-lief-0.15-compat +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Add compatibility for LIEF=0.15. (#5564 via #5565) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* From defa99515c2f0461aec36311f6439d39f3ee4313 Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:20:14 +0100 Subject: [PATCH 6/9] Updated CHANGELOG for 25.1.0 --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79226dafbb..485e7c8675 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ [//]: # (current developments) +## 25.1.0 (2025-01-13) + +### Contributors + +* @conda-bot +* @carterbox +* @jaimergp +* @ForgottenProgramme +* @beckermr +* @tttc3 +* @tkelman +* @ypradat +* @dependabot[bot] +* @pre-commit-ci[bot] + + + ## 24.11.2 (2024-11-26) ### Bug fixes From 4154b622a3d0b13d55753cfd4ec30a18ffbf1406 Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:25:00 +0100 Subject: [PATCH 7/9] Updated authorship for 25.1.0 --- .authors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.authors.yml b/.authors.yml index 15ea11e645..3d651814ea 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1489,5 +1489,5 @@ - name: Mahe Iram Khan email: forgotten.programme@gmail.com github: ForgottenProgramme - num_commits: 4 + num_commits: 6 first_commit: 2025-01-13 18:15:05 From 0ff89283f62dec3a28e5946635db4530c01ff09f Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:26:45 +0100 Subject: [PATCH 8/9] add first time contributors --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 485e7c8675..4d1d4f56fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,8 +10,8 @@ * @ForgottenProgramme * @beckermr * @tttc3 -* @tkelman -* @ypradat +* @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] From 2f3043f7a17ec1aab330635193470ea47b361d77 Mon Sep 17 00:00:00 2001 From: Mahe Iram Khan Date: Mon, 13 Jan 2025 18:31:07 +0100 Subject: [PATCH 9/9] add missing changelog item --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d1d4f56fc..130d0b19a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,26 @@ ## 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