From 89c99bd8351c306ed36df7939a9d13e23178474c Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Sep 2023 15:55:28 -0500 Subject: [PATCH 1/8] Update .authors.yml --- .authors.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.authors.yml b/.authors.yml index 2989dbcb6a..7f46d37c4a 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1294,6 +1294,8 @@ first_commit: 2022-04-18 12:03:05 - name: Jürgen Gmach email: juergen.gmach@googlemail.com + alternate_emails: + - juergen.gmach@canonical.com github: jugmac00 num_commits: 2 first_commit: 2022-05-31 07:52:17 @@ -1393,3 +1395,15 @@ github: josegonzalez num_commits: 1 first_commit: 2023-06-14 16:02:40 +- name: Jack Olivieri + email: boldorider4@gmail.com + github: boldorider4 +- name: Wolf Vollprecht + email: w.vollprecht@gmail.com + github: wolfv +- name: Dave Karetnyk + email: Dave.Karetnyk@gmail.com + github: DaveKaretnyk +- name: Shaun Walbridge + email: 46331011+scdub@users.noreply.github.com + github: scdub From 993c90ed02eb699bc64fe89efa3443b69cb5a7c2 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Sep 2023 15:56:49 -0500 Subject: [PATCH 2/8] Update .mailmap --- .mailmap | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 30d67ba59b..2f7457f813 100644 --- a/.mailmap +++ b/.mailmap @@ -73,6 +73,7 @@ Daniel Holth Darren Dale Dave Clements Dave Hirschfeld David Hirschfeld +Dave Karetnyk David Froger David Li Derek Ludwig @@ -107,6 +108,7 @@ Ilan Schnell Ilan Schnell Ilan Schnell Isuru Fernando Isuru Fernando Ivan Kalev ikalev +Jack Olivieri Jacob Walls Jaime Rodríguez-Guerra James Abbott @@ -136,7 +138,7 @@ Joseph Hunkeler Juan Lasheras jlas Julian Rüth Julien Schueller -Jürgen Gmach +Jürgen Gmach Jürgen Gmach Jędrzej Nowak Jedrzej Nowak Kai Tietz Kai Tietz <47363620+katietz@users.noreply.github.com> Kale Franz Kale Franz @@ -230,6 +232,7 @@ Sean Yen seanyen Sergio Oller Serhii Kupriienko <79282962+skupr-anaconda@users.noreply.github.com> Shaun Walbridge +Shaun Walbridge <46331011+scdub@users.noreply.github.com> Siu Kwan Lam Sophia Castellarin sophia Sophia Castellarin sophia @@ -267,6 +270,7 @@ Uwe L. Korn Vlad Frolov Wes Turner Wim Glenn wim glenn +Wolf Vollprecht Wolfgang Ulmer Yann Yoav Ram From be63220f7e43c2d804c1c64b0482589554ab1ae6 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Sep 2023 16:00:26 -0500 Subject: [PATCH 3/8] Update news --- news/4792-remove-glob2 | 2 +- news/4956-improve-command-plugin | 3 +-- news/4960-conform-to-recipe-standards | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/news/4792-remove-glob2 b/news/4792-remove-glob2 index 28be064471..cb6c75844c 100644 --- a/news/4792-remove-glob2 +++ b/news/4792-remove-glob2 @@ -1,3 +1,3 @@ ### Enhancements -* Remove `glob2` as a dependency. As of Python 3.5, the '**', operator was available to glob when using `recursive=True`. Builtin glob is also much faster. (#5005) +* Remove `glob2` dependency. As of Python 3.5, the '**', operator was available to `glob` when using `recursive=True`. Builtin glob is also much faster. (#5005) diff --git a/news/4956-improve-command-plugin b/news/4956-improve-command-plugin index 0795fab179..fbe6a600f3 100644 --- a/news/4956-improve-command-plugin +++ b/news/4956-improve-command-plugin @@ -4,8 +4,7 @@ ### Bug fixes -* Delay imports in conda command plugin until the command is used, avoiding - import-time side effects. (#4949) +* Delay imports in conda command plugin until the command is used, avoiding import-time side effects. (#4949) ### Deprecations diff --git a/news/4960-conform-to-recipe-standards b/news/4960-conform-to-recipe-standards index a28b5f6c89..f21fea3f88 100644 --- a/news/4960-conform-to-recipe-standards +++ b/news/4960-conform-to-recipe-standards @@ -8,7 +8,7 @@ ### Deprecations -* When templating new recipes from a pypi package, the build script `{{ PYTHON }} -m pip install . -vv` is deprecated in favor of `{{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation`. (#4960) +* When templating new recipes from a PyPI package, the build script `{{ PYTHON }} -m pip install . -vv` is deprecated in favor of `{{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation`. (#4960) ### Docs From 6309cb1824c10698043c0c5733370fce20c264ee Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Sep 2023 16:01:18 -0500 Subject: [PATCH 4/8] Update authorship for 3.27.0 --- .authors.yml | 42 +++++++++++++++++++++++++----------------- AUTHORS.md | 4 ++++ 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.authors.yml b/.authors.yml index 7f46d37c4a..655ac837e3 100644 --- a/.authors.yml +++ b/.authors.yml @@ -7,7 +7,7 @@ aliases: - Mike Sarahan - Michael Sarahan - num_commits: 2000 + num_commits: 4000 first_commit: 2015-09-04 21:31:08 - name: Jonathan J. Helmus email: jjhelmus@gmail.com @@ -63,7 +63,7 @@ alternate_emails: - mandeep@users.noreply.github.com - mbhutani@continuum.io - num_commits: 43 + num_commits: 86 first_commit: 2017-05-17 23:54:01 github: mandeep - name: Filipe Fernandes @@ -117,7 +117,7 @@ - heather999@users.noreply.github.com aliases: - heather999 - num_commits: 2 + num_commits: 4 first_commit: 2016-04-11 12:02:50 github: heather999 - name: Ryan Grout @@ -571,7 +571,7 @@ alternate_emails: - scastellarin95@gmail.com - scastellarin@anaconda.com - num_commits: 98 + num_commits: 196 first_commit: 2016-09-06 16:58:21 github: soapy1 - name: Bruno Oliveira @@ -754,7 +754,7 @@ alternate_emails: - kirkhamj@janelia.hhmi.org - jakirkham@gmail.com - num_commits: 73 + num_commits: 146 first_commit: 2015-04-21 13:26:39 github: jakirkham - name: Anthony Scopatz @@ -873,7 +873,7 @@ alternate_emails: - 5738695+183amir@users.noreply.github.com - amir.mohammadi@idiap.ch - num_commits: 6 + num_commits: 12 first_commit: 2018-02-27 16:37:19 - name: David Li email: li.davidm96@gmail.com @@ -967,7 +967,7 @@ first_commit: 2019-01-26 13:17:33 - name: Rachel Rigdon email: rrigdon@anaconda.com - num_commits: 134 + num_commits: 268 first_commit: 2019-01-24 15:12:09 github: rrigdon aliases: @@ -1118,7 +1118,7 @@ alternate_emails: - becker.mr@gmail.com - beckermr@users.noreply.github.com - num_commits: 19 + num_commits: 38 first_commit: 2019-10-17 23:05:16 github: beckermr - name: Jinzhe Zeng @@ -1199,7 +1199,7 @@ alternate_emails: - clee@anaconda.com - name: Ken Odegard - num_commits: 130 + num_commits: 133 email: kodegard@anaconda.com first_commit: 2020-09-08 19:53:41 github: kenodegard @@ -1222,7 +1222,7 @@ first_commit: 2020-11-19 10:46:41 - name: Jannis Leidel email: jannis@leidel.info - num_commits: 27 + num_commits: 30 github: jezdez first_commit: 2020-11-19 10:46:41 - name: Christof Kaufmann @@ -1237,7 +1237,7 @@ github: pre-commit-ci[bot] aliases: - pre-commit-ci[bot] - num_commits: 48 + num_commits: 52 first_commit: 2021-11-20 01:47:17 - name: Jacob Walls email: jacobtylerwalls@gmail.com @@ -1248,7 +1248,7 @@ github: beeankha alternate_emails: - beeankha@gmail.com - num_commits: 19 + num_commits: 20 first_commit: 2022-01-19 16:40:06 - name: Conda Bot email: 18747875+conda-bot@users.noreply.github.com @@ -1259,7 +1259,7 @@ alternate_emails: - ad-team+condabot@anaconda.com - 18747875+conda-bot@users.noreply.github.com - num_commits: 35 + num_commits: 76 first_commit: 2022-01-17 18:09:22 - name: Uwe L. Korn email: xhochy@users.noreply.github.com @@ -1297,7 +1297,7 @@ alternate_emails: - juergen.gmach@canonical.com github: jugmac00 - num_commits: 2 + num_commits: 3 first_commit: 2022-05-31 07:52:17 - name: Katherine Kinnaman email: kkinnaman@anaconda.com @@ -1307,7 +1307,7 @@ - name: dependabot[bot] email: 49699333+dependabot[bot]@users.noreply.github.com github: dependabot[bot] - num_commits: 3 + num_commits: 4 first_commit: 2022-05-31 04:34:40 - name: Serhii Kupriienko email: 79282962+skupr-anaconda@users.noreply.github.com @@ -1324,7 +1324,7 @@ - name: Jaime Rodríguez-Guerra email: jaimergp@users.noreply.github.com github: jaimergp - num_commits: 3 + num_commits: 4 first_commit: 2022-11-02 19:34:51 - name: Dave Clements email: tnabtaf@gmail.com @@ -1371,7 +1371,7 @@ aliases: - Ryan github: ryanskeith - num_commits: 3 + num_commits: 5 first_commit: 2023-03-22 03:11:02 - name: Rishabh Singh email: 67859818+rishabh11336@users.noreply.github.com @@ -1398,12 +1398,20 @@ - name: Jack Olivieri email: boldorider4@gmail.com github: boldorider4 + num_commits: 1 + first_commit: 2023-08-30 10:32:34 - name: Wolf Vollprecht email: w.vollprecht@gmail.com github: wolfv + num_commits: 1 + first_commit: 2023-09-22 07:01:49 - name: Dave Karetnyk email: Dave.Karetnyk@gmail.com github: DaveKaretnyk + num_commits: 1 + first_commit: 2023-09-16 05:21:09 - name: Shaun Walbridge email: 46331011+scdub@users.noreply.github.com github: scdub + num_commits: 2 + first_commit: 2023-08-18 02:53:28 diff --git a/AUTHORS.md b/AUTHORS.md index 23a0911835..cbfba08e20 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -56,6 +56,7 @@ Authors are sorted alphabetically. * Darren Dale * Dave Clements * Dave Hirschfeld +* Dave Karetnyk * David Froger * David Li * Derek Ludwig @@ -89,6 +90,7 @@ Authors are sorted alphabetically. * Ilan Schnell * Isuru Fernando * Ivan Kalev +* Jack Olivieri * Jacob Walls * Jaime Rodríguez-Guerra * James Abbott @@ -193,6 +195,7 @@ Authors are sorted alphabetically. * Sergio Oller * Serhii Kupriienko * Shaun Walbridge +* Shaun Walbridge * Siu Kwan Lam * Sophia Castellarin * Sophian Guidara @@ -226,6 +229,7 @@ Authors are sorted alphabetically. * Vlad Frolov * Wes Turner * Wim Glenn +* Wolf Vollprecht * Wolfgang Ulmer * Yann * Yoav Ram From 033339922f5337530cb0004bd10ca9b3fb448671 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Sep 2023 16:01:19 -0500 Subject: [PATCH 5/8] Update CHANGELOG for 3.27.0 --- CHANGELOG.md | 40 +++++++++++++++++++ ...53-document-compatibility-release-operator | 3 -- news/4792-remove-glob2 | 3 -- news/4813-wasm-platforms | 19 --------- news/4942-docs-prefix-activation | 19 --------- news/4956-improve-command-plugin | 19 --------- news/4960-conform-to-recipe-standards | 19 --------- news/4995-run-conda-build-in-base-env | 19 --------- 8 files changed, 40 insertions(+), 101 deletions(-) delete mode 100644 news/4553-document-compatibility-release-operator delete mode 100644 news/4792-remove-glob2 delete mode 100644 news/4813-wasm-platforms delete mode 100644 news/4942-docs-prefix-activation delete mode 100644 news/4956-improve-command-plugin delete mode 100644 news/4960-conform-to-recipe-standards delete mode 100644 news/4995-run-conda-build-in-base-env diff --git a/CHANGELOG.md b/CHANGELOG.md index c23c0d80d2..167047f14f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,45 @@ [//]: # (current developments) +## 3.27.0 (2023-09-26) + +### Enhancements + +* Remove `glob2` dependency. As of Python 3.5, the '**', operator was available to `glob` when using `recursive=True`. Builtin glob is also much faster. (#5005) +* Handle `emscripten-wasm32` and `wasi-wasm32` platforms. (#4813) + +### Bug fixes + +* Delay imports in conda command plugin until the command is used, avoiding import-time side effects. (#4949) + +### Deprecations + +* When templating new recipes from a PyPI package, the build script `{{ PYTHON }} -m pip install . -vv` is deprecated in favor of `{{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation`. (#4960) + +### Docs + +* Document `~=` (compatibility release) match spec. (#4553) +* Clarify that the `build` prefix is activated _after_ the `host` prefix. (#4942) +* Add explanation that conda-build should be run from the base env. (#4995) + +### Contributors + +* @beeankha +* @conda-bot +* @dholth +* @DaveKaretnyk +* @boldorider4 +* @jaimergp +* @jezdez +* @jugmac00 +* @kenodegard +* @ryanskeith +* @scdub +* @wolfv +* @dependabot[bot] +* @pre-commit-ci[bot] + + + ## 3.26.1 (2023-08-17) ### Bug fixes diff --git a/news/4553-document-compatibility-release-operator b/news/4553-document-compatibility-release-operator deleted file mode 100644 index f5d3dcde47..0000000000 --- a/news/4553-document-compatibility-release-operator +++ /dev/null @@ -1,3 +0,0 @@ -### Docs - -* Document `~=` (compatibility release) match spec. (#4553) diff --git a/news/4792-remove-glob2 b/news/4792-remove-glob2 deleted file mode 100644 index cb6c75844c..0000000000 --- a/news/4792-remove-glob2 +++ /dev/null @@ -1,3 +0,0 @@ -### Enhancements - -* Remove `glob2` dependency. As of Python 3.5, the '**', operator was available to `glob` when using `recursive=True`. Builtin glob is also much faster. (#5005) diff --git a/news/4813-wasm-platforms b/news/4813-wasm-platforms deleted file mode 100644 index 1dd82f5479..0000000000 --- a/news/4813-wasm-platforms +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Handle `emscripten-wasm32` and `wasi-wasm32` platforms. (#4813) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/4942-docs-prefix-activation b/news/4942-docs-prefix-activation deleted file mode 100644 index 9c9f0ca7f5..0000000000 --- a/news/4942-docs-prefix-activation +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* Clarify that the `build` prefix is activated _after_ the `host` prefix. (#4942) - -### Other - -* diff --git a/news/4956-improve-command-plugin b/news/4956-improve-command-plugin deleted file mode 100644 index fbe6a600f3..0000000000 --- a/news/4956-improve-command-plugin +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Delay imports in conda command plugin until the command is used, avoiding import-time side effects. (#4949) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/4960-conform-to-recipe-standards b/news/4960-conform-to-recipe-standards deleted file mode 100644 index f21fea3f88..0000000000 --- a/news/4960-conform-to-recipe-standards +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* When templating new recipes from a PyPI package, the build script `{{ PYTHON }} -m pip install . -vv` is deprecated in favor of `{{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation`. (#4960) - -### Docs - -* - -### Other - -* diff --git a/news/4995-run-conda-build-in-base-env b/news/4995-run-conda-build-in-base-env deleted file mode 100644 index 41a6fc82d9..0000000000 --- a/news/4995-run-conda-build-in-base-env +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* Add explanation that conda-build should be run from the base env. (#4995) - -### Other - -* From a3bb0a99e9c71ec7115fdd9f845b23edf810b424 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 26 Sep 2023 16:03:36 -0500 Subject: [PATCH 6/8] Add first-time contributions --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 167047f14f..4ffc480f6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,15 +26,15 @@ * @beeankha * @conda-bot * @dholth -* @DaveKaretnyk -* @boldorider4 +* @DaveKaretnyk made their first contribution in https://github.com/conda/conda-build/pull/5004 +* @boldorider4 made their first contribution in https://github.com/conda/conda-build/pull/4960 * @jaimergp * @jezdez * @jugmac00 * @kenodegard * @ryanskeith -* @scdub -* @wolfv +* @scdub made their first contribution in https://github.com/conda/conda-build/pull/4965 +* @wolfv made their first contribution in https://github.com/conda/conda-build/pull/4813 * @dependabot[bot] * @pre-commit-ci[bot] From 67f58c09b3f1a697285193450e817ccc36bc4494 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 27 Sep 2023 16:50:39 +0200 Subject: [PATCH 7/8] Update CHANGELOG.md Co-authored-by: Bianca Henderson --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ffc480f6d..3d14e6556f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,7 @@ * Document `~=` (compatibility release) match spec. (#4553) * Clarify that the `build` prefix is activated _after_ the `host` prefix. (#4942) -* Add explanation that conda-build should be run from the base env. (#4995) +* Add explanation that conda-build should be run from the base environment. (#4995) ### Contributors From 67103895029b43f9041f5020f26169dfe5e35837 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Wed, 27 Sep 2023 10:43:40 -0500 Subject: [PATCH 8/8] Revert incorrect num_commits --- .authors.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.authors.yml b/.authors.yml index 655ac837e3..e0a69846c8 100644 --- a/.authors.yml +++ b/.authors.yml @@ -7,7 +7,7 @@ aliases: - Mike Sarahan - Michael Sarahan - num_commits: 4000 + num_commits: 2000 first_commit: 2015-09-04 21:31:08 - name: Jonathan J. Helmus email: jjhelmus@gmail.com @@ -63,7 +63,7 @@ alternate_emails: - mandeep@users.noreply.github.com - mbhutani@continuum.io - num_commits: 86 + num_commits: 43 first_commit: 2017-05-17 23:54:01 github: mandeep - name: Filipe Fernandes @@ -117,7 +117,7 @@ - heather999@users.noreply.github.com aliases: - heather999 - num_commits: 4 + num_commits: 2 first_commit: 2016-04-11 12:02:50 github: heather999 - name: Ryan Grout @@ -571,7 +571,7 @@ alternate_emails: - scastellarin95@gmail.com - scastellarin@anaconda.com - num_commits: 196 + num_commits: 98 first_commit: 2016-09-06 16:58:21 github: soapy1 - name: Bruno Oliveira @@ -754,7 +754,7 @@ alternate_emails: - kirkhamj@janelia.hhmi.org - jakirkham@gmail.com - num_commits: 146 + num_commits: 73 first_commit: 2015-04-21 13:26:39 github: jakirkham - name: Anthony Scopatz @@ -873,7 +873,7 @@ alternate_emails: - 5738695+183amir@users.noreply.github.com - amir.mohammadi@idiap.ch - num_commits: 12 + num_commits: 6 first_commit: 2018-02-27 16:37:19 - name: David Li email: li.davidm96@gmail.com @@ -967,7 +967,7 @@ first_commit: 2019-01-26 13:17:33 - name: Rachel Rigdon email: rrigdon@anaconda.com - num_commits: 268 + num_commits: 134 first_commit: 2019-01-24 15:12:09 github: rrigdon aliases: @@ -1118,7 +1118,7 @@ alternate_emails: - becker.mr@gmail.com - beckermr@users.noreply.github.com - num_commits: 38 + num_commits: 19 first_commit: 2019-10-17 23:05:16 github: beckermr - name: Jinzhe Zeng @@ -1259,7 +1259,7 @@ alternate_emails: - ad-team+condabot@anaconda.com - 18747875+conda-bot@users.noreply.github.com - num_commits: 76 + num_commits: 38 first_commit: 2022-01-17 18:09:22 - name: Uwe L. Korn email: xhochy@users.noreply.github.com