From 7e25b6b5c043e936df856a1115f5367390a536b3 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Tue, 10 Oct 2023 18:51:11 +0200 Subject: [PATCH 1/3] Updated authorship for 3.5.0 --- .authors.yml | 22 +++++++++++++++++----- .mailmap | 1 + AUTHORS.md | 1 + 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.authors.yml b/.authors.yml index 55dd2d33c..e5f88bee5 100644 --- a/.authors.yml +++ b/.authors.yml @@ -69,16 +69,18 @@ - ilan@continuum.io num_commits: 351 first_commit: 2016-02-12 00:50:29 + github: ilanschnell - name: Jean-Luc Stevens email: jlstevens@ed.ac.uk alternate_emails: - jlrstevens@gmail.com aliases: - jlstevens - num_commits: 2 + num_commits: 3 first_commit: 2016-12-13 15:56:37 github: jlstevens - name: bkreider + github: bkreider email: github-bk@drrr.net num_commits: 1 first_commit: 2016-02-29 18:59:14 @@ -97,6 +99,7 @@ first_commit: 2017-01-18 15:21:20 github: wulmer - name: Martin Durant + github: martindurant email: martin.durant@utoronto.ca num_commits: 5 first_commit: 2017-11-09 08:53:20 @@ -143,6 +146,7 @@ - name: Trent Nelson email: trent@trent.me num_commits: 1 + github: tpn first_commit: 2017-09-15 15:04:51 - name: Michael C. Grant email: mgrant@anaconda.com @@ -178,12 +182,14 @@ first_commit: 2020-09-02 02:28:26 github: marimeireles - name: astaric + github: astaric email: anze.staric@gmail.com num_commits: 1 first_commit: 2019-08-28 05:42:13 - name: Angela Gloyna email: angela.gloyna@gmail.com num_commits: 8 + github: angloyna first_commit: 2020-05-04 20:34:58 - name: Eric Prestat email: eric.prestat@gmail.com @@ -227,6 +233,7 @@ first_commit: 2020-10-21 10:45:10 github: FaustinCarter - name: Connor Martin + github: cjmartian email: connormartin7@gmail.com num_commits: 1 first_commit: 2021-03-24 12:38:03 @@ -257,7 +264,7 @@ github: chenghlee - name: conda-bot email: ad-team+condabot@anaconda.com - num_commits: 25 + num_commits: 28 first_commit: 2022-01-25 21:38:28 alternate_emails: - 18747875+conda-bot@users.noreply.github.com @@ -270,7 +277,7 @@ aliases: - Jaime RGP - jaimergp - num_commits: 54 + num_commits: 60 first_commit: 2022-01-08 14:56:53 github: jaimergp - name: Tom Hören @@ -350,7 +357,7 @@ github: RahulARanger - name: Marco Esters email: mesters@anaconda.com - num_commits: 6 + num_commits: 8 first_commit: 2023-05-12 11:44:12 github: marcoesters - name: Darryl Miles @@ -365,6 +372,11 @@ github: deepeshaburse - name: pre-commit-ci[bot] email: 66853113+pre-commit-ci[bot]@users.noreply.github.com - num_commits: 7 + num_commits: 10 first_commit: 2023-05-02 12:01:43 github: pre-commit-ci[bot] +- name: Matthias Kuhn + email: matthias@opengis.ch + num_commits: 2 + first_commit: 2023-08-24 09:31:48 + github: m-kuhn diff --git a/.mailmap b/.mailmap index 50883c6c1..9a180353c 100644 --- a/.mailmap +++ b/.mailmap @@ -48,6 +48,7 @@ Mark Harfouche Martin Durant Mathew Topper Matthew Newville +Matthias Kuhn Michael C. Grant Michael C. Grant Michael Sarahan Mike Sarahan Nehal J Wani diff --git a/AUTHORS.md b/AUTHORS.md index 10617868c..aee13b544 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -37,6 +37,7 @@ Authors are sorted alphabetically. * Martin Durant * Mathew Topper * Matthew Newville +* Matthias Kuhn * Michael C. Grant * Michael Sarahan * Nehal J Wani From 036cdc3defd587cfb9e03efb61985998fa0df24e Mon Sep 17 00:00:00 2001 From: jaimergp Date: Tue, 10 Oct 2023 18:55:03 +0200 Subject: [PATCH 2/3] Updated CHANGELOG for 3.5.0 --- CHANGELOG.md | 26 ++++++++++++++++++++++++++ news/709-test-import-fixes | 19 ------------------- news/711-conda-standalone-canaries | 19 ------------------- news/713-update-conda-init-wording | 19 ------------------- news/716-register-envs | 19 ------------------- news/718-script_env_variables-option | 21 --------------------- news/722-license-yn | 19 ------------------- 7 files changed, 26 insertions(+), 116 deletions(-) delete mode 100644 news/709-test-import-fixes delete mode 100644 news/711-conda-standalone-canaries delete mode 100644 news/713-update-conda-init-wording delete mode 100644 news/716-register-envs delete mode 100644 news/718-script_env_variables-option delete mode 100644 news/722-license-yn diff --git a/CHANGELOG.md b/CHANGELOG.md index e69ef6bfb..6d57ebd0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ [//]: # (current developments) +## 2023-10-10 3.5.0: +### Enhancements + +* Add support for the `register_envs` option. (#705 via #716) +* Add new option `script_env_variables`. Allows defining + environment variables in `construct.yaml` for use by pre- and + post-install scripts. (#718) + +### Bug fixes + +* Fix imports and skips for constructor tests. (#709) +* Fix a regression in the license prompt on SH installers to require a explicit answer instead of defaulting to `no` on Enter. (#721 via #722) + +### Other + +* Test `conda-standalone` canaries in CI. (#711) +* Clarify consequences for when `conda init` is run during the installation. (#713) + +### Contributors + +* @jaimergp +* @jlstevens +* @marcoesters +* @m-kuhn + + ## 2023-08-02 3.4.5: ### Enhancements diff --git a/news/709-test-import-fixes b/news/709-test-import-fixes deleted file mode 100644 index 8c8211530..000000000 --- a/news/709-test-import-fixes +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix imports and skips for constructor tests. (#709) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/711-conda-standalone-canaries b/news/711-conda-standalone-canaries deleted file mode 100644 index f5c52ab71..000000000 --- a/news/711-conda-standalone-canaries +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* Test `conda-standalone` canaries in CI. (#711) diff --git a/news/713-update-conda-init-wording b/news/713-update-conda-init-wording deleted file mode 100644 index c1061b881..000000000 --- a/news/713-update-conda-init-wording +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* Clarify consequences for when `conda init` is run during the installation. (#713) diff --git a/news/716-register-envs b/news/716-register-envs deleted file mode 100644 index 46b22473b..000000000 --- a/news/716-register-envs +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Add support for the `register_envs` option. (#705 via #716) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/718-script_env_variables-option b/news/718-script_env_variables-option deleted file mode 100644 index 9ff8e5f67..000000000 --- a/news/718-script_env_variables-option +++ /dev/null @@ -1,21 +0,0 @@ -### Enhancements - -* Added support for `script_env_variables` allowing specification of - environment variables in the `construct.yaml` for use by pre- and - post-install scripts. - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/722-license-yn b/news/722-license-yn deleted file mode 100644 index 3c74bb242..000000000 --- a/news/722-license-yn +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix a regression in the license prompt on SH installers to require a explicit answer instead of defaulting to `no` on Enter. (#721 via #722) - -### Deprecations - -* - -### Docs - -* - -### Other - -* From 03ce4da1b63d7ba6e948fa4d75ee512723ac33f1 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Tue, 10 Oct 2023 19:00:57 +0200 Subject: [PATCH 3/3] add new contributors --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d57ebd0a..6b6b3515b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * Test `conda-standalone` canaries in CI. (#711) * Clarify consequences for when `conda init` is run during the installation. (#713) +* Log which subprocesses are run in `osxpkg`. (#715) ### Contributors @@ -25,6 +26,9 @@ * @marcoesters * @m-kuhn +### New contributors + +* @m-kuhn made their first contribution in https://github.com/conda/constructor/pull/710 ## 2023-08-02 3.4.5: ### Enhancements