From aa2ab38ec5023504df5fcfbcc2bdcfc1ff07c0ff Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Fri, 15 Mar 2024 12:09:46 -0400 Subject: [PATCH 1/8] Update .authors.yml --- .authors.yml | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/.authors.yml b/.authors.yml index dc7b1a4258..596d531dbc 100644 --- a/.authors.yml +++ b/.authors.yml @@ -8,7 +8,7 @@ aliases: - Mike Sarahan - Michael Sarahan - num_commits: 2001 + num_commits: 4002 first_commit: 2015-09-04 21:31:08 - name: Jonathan J. Helmus email: jjhelmus@gmail.com @@ -64,7 +64,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 @@ -118,7 +118,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 @@ -162,7 +162,7 @@ aliases: - MinRK github: minrk - num_commits: 15 + num_commits: 16 first_commit: 2014-02-13 19:43:59 - name: Matty G email: meawoppl@gmail.com @@ -572,7 +572,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 @@ -612,7 +612,7 @@ first_commit: 2015-08-30 06:44:37 - name: Marcel Bargull email: marcel.bargull@udo.edu - num_commits: 82 + num_commits: 85 first_commit: 2016-09-26 11:45:54 github: mbargull alternate_emails: @@ -755,7 +755,7 @@ alternate_emails: - kirkhamj@janelia.hhmi.org - jakirkham@gmail.com - num_commits: 74 + num_commits: 148 first_commit: 2015-04-21 13:26:39 github: jakirkham - name: Anthony Scopatz @@ -874,7 +874,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 @@ -968,7 +968,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: @@ -1121,7 +1121,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 @@ -1202,7 +1202,7 @@ alternate_emails: - clee@anaconda.com - name: Ken Odegard - num_commits: 168 + num_commits: 178 email: kodegard@anaconda.com first_commit: 2020-09-08 19:53:41 github: kenodegard @@ -1240,7 +1240,7 @@ github: pre-commit-ci[bot] aliases: - pre-commit-ci[bot] - num_commits: 61 + num_commits: 64 first_commit: 2021-11-20 01:47:17 - name: Jacob Walls email: jacobtylerwalls@gmail.com @@ -1251,7 +1251,7 @@ github: beeankha alternate_emails: - beeankha@gmail.com - num_commits: 20 + num_commits: 21 first_commit: 2022-01-19 16:40:06 - name: Conda Bot email: 18747875+conda-bot@users.noreply.github.com @@ -1262,7 +1262,7 @@ alternate_emails: - ad-team+condabot@anaconda.com - 18747875+conda-bot@users.noreply.github.com - num_commits: 44 + num_commits: 96 first_commit: 2022-01-17 18:09:22 - name: Uwe L. Korn email: xhochy@users.noreply.github.com @@ -1271,7 +1271,7 @@ - name: Daniel Holth email: dholth@anaconda.com github: dholth - num_commits: 14 + num_commits: 15 first_commit: 2022-04-28 05:22:14 - name: Rylan Chord email: rchord@users.noreply.github.com @@ -1281,7 +1281,7 @@ - name: Travis Hathaway email: travis.j.hathaway@gmail.com github: travishathaway - num_commits: 6 + num_commits: 7 first_commit: 2022-05-12 05:53:02 - name: Kyle Leaders email: remkade@users.noreply.github.com @@ -1305,7 +1305,7 @@ - name: Katherine Kinnaman email: kkinnaman@anaconda.com github: kathatherine - num_commits: 2 + num_commits: 3 first_commit: 2022-07-07 10:56:31 - name: dependabot[bot] email: 49699333+dependabot[bot]@users.noreply.github.com @@ -1376,7 +1376,7 @@ aliases: - Ryan github: ryanskeith - num_commits: 5 + num_commits: 6 first_commit: 2023-03-22 03:11:02 - name: Rishabh Singh email: 67859818+rishabh11336@users.noreply.github.com @@ -1434,3 +1434,8 @@ - h-vetinari num_commits: 1 first_commit: 2023-10-25 09:33:34 +- name: Finn Womack + email: flan313@gmail.com + num_commits: 1 + first_commit: 2024-02-06 11:43:45 + github: finnagin From 76c03a81a76d7ca64bc05608e39ce704af24acaa Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Fri, 15 Mar 2024 12:10:53 -0400 Subject: [PATCH 2/8] Update .mailmap --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 17e816d480..02df1bf754 100644 --- a/.mailmap +++ b/.mailmap @@ -92,6 +92,7 @@ Evan Klitzke Felix Kühnl Ferry Firmansjah <103191403+ffirmanff@users.noreply.github.com> Filipe Fernandes ocefpaf +Finn Womack Floris Bruynooghe Gabriel Reis Gaëtan de Menten From af4da247caad72cab3cbc8497b2c0cc8a610aaca Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Fri, 15 Mar 2024 12:12:13 -0400 Subject: [PATCH 3/8] Updated authorship for 24.3.0 --- .authors.yml | 2 +- AUTHORS.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.authors.yml b/.authors.yml index 596d531dbc..69afb31f6a 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1251,7 +1251,7 @@ github: beeankha alternate_emails: - beeankha@gmail.com - num_commits: 21 + num_commits: 23 first_commit: 2022-01-19 16:40:06 - name: Conda Bot email: 18747875+conda-bot@users.noreply.github.com diff --git a/AUTHORS.md b/AUTHORS.md index 7667f98c40..969994f016 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -75,6 +75,7 @@ Authors are sorted alphabetically. * Felix Kühnl * Ferry Firmansjah * Filipe Fernandes +* Finn Womack * Floris Bruynooghe * Gabriel Reis * Gaëtan de Menten From b29b003ddbd00b72801bfa8e6eba32bc30e34680 Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Fri, 15 Mar 2024 12:12:14 -0400 Subject: [PATCH 4/8] Updated CHANGELOG for 24.3.0 --- CHANGELOG.md | 100 +++++++++++++++++++ news/4867-arm64-msvc-env-cmd-no-op | 19 ---- news/5195-fix-stdlib-variant | 19 ---- news/5196-deprecate-bdist-conda | 19 ---- news/5199-deprecate-have_prefix_files | 19 ---- news/5203-remove-deprecations | 80 --------------- news/5208-deprecate-get_output_file_path | 19 ---- news/5219-deprecate-Environment | 19 ---- news/5221-deprecate-get_version_from_git_tag | 19 ---- news/5228-lief-0.14-compat | 19 ---- 10 files changed, 100 insertions(+), 232 deletions(-) delete mode 100644 news/4867-arm64-msvc-env-cmd-no-op delete mode 100644 news/5195-fix-stdlib-variant delete mode 100644 news/5196-deprecate-bdist-conda delete mode 100644 news/5199-deprecate-have_prefix_files delete mode 100644 news/5203-remove-deprecations delete mode 100644 news/5208-deprecate-get_output_file_path delete mode 100644 news/5219-deprecate-Environment delete mode 100644 news/5221-deprecate-get_version_from_git_tag delete mode 100644 news/5228-lief-0.14-compat diff --git a/CHANGELOG.md b/CHANGELOG.md index 840bc6636a..bbb72ce174 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,105 @@ [//]: # (current developments) +## 24.3.0 (2024-03-15) + +### Enhancements + +* Add compatibility for LIEF=0.14. (#5227 via #5228) + +### Bug fixes + +* Fix stdlib being recognized in variant hash inputs. (#5190 via #5195) + +### Deprecations + +* Mark `conda_build.bdist_conda` module as pending deprecation. (#5196) +* Mark `conda_build.build.have_prefix_files` as deprecated. (#5199) +* Mark `conda_build.conda_interface.handle_proxy_407` as deprecated. Handled by `conda.gateways.connection.session.CondaSession`. (#5203) +* Mark `conda_build.conda_interface.hashsum_file` as deprecated. Use `conda.gateways.disk.read.compute_sum` instead. (#5203) +* Mark `conda_build.conda_interface.md5_file` as deprecated. Use `conda.gateways.disk.read.compute_sum(path, 'md5')` instead. (#5203) +* Mark `conda_build.environ.PREFIX_ACTION` as deprecated. (#5203) +* Mark `conda_build.environ.LINK_ACTION` as deprecated. (#5203) +* Mark `conda_build.environ.cache_actions` as deprecated. (#5203) +* Mark `conda_build.index.DummyExecutor` as deprecated. (#5203) +* Mark `conda_build.index.MAX_THREADS_DEFAULT` as deprecated. (#5203) +* Mark `conda_build.index.LOCK_TIMEOUT_SECS` as deprecated. (#5203) +* Mark `conda_build.index.LOCKFILE_NAME` as deprecated. (#5203) +* Postpone `conda_build.index.channel_data` deprecation. (#5203) +* Rename `conda_build.environ.create_env('specs_or_actions' -> 'specs_or_precs')`. (#5203) +* Rename `conda_build.environ._execute_actions('actions' -> 'precs'). (#5203) +* Rename `conda_build.environ._display_actions('actions' -> 'precs'). (#5203) +* Rename `conda_build.inspect.check_install('platform' -> 'subdir')`. (#5203) +* Rename `conda_build.render.execute_download_actions('actions' -> 'precs')`. (#5203) +* Rename `conda_build.render.get_upstream_pins('actions' -> 'precs')`. (#5203) +* Remove `conda_build.cli.main_render.execute(print_results)`. (#5203) +* Remove `conda_build.conda_interface.Dist`. (#5203) +* Remove `conda_build.conda_interface.display_actions`. (#5203) +* Remove `conda_build.conda_interface.execute_actions`. (#5203) +* Remove `conda_build.conda_interface.execute_plan`. (#5203) +* Remove `conda_build.conda_interface.install_actions`. (#5203) +* Remove `conda_build.conda_interface.linked`. (#5203) +* Remove `conda_build.conda_interface.linked_data`. (#5203) +* Remove `conda_build.conda_interface.package_cache`. (#5203) +* Remove `conda_build.environ.get_install_actions`. Use `conda_build.environ.get_package_records` instead. (#5203) +* Remove `conda_build.index._determine_namespace`. (#5203) +* Remove `conda_build.index._make_seconds`. (#5203) +* Remove `conda_build.index.REPODATA_VERSION`. (#5203) +* Remove `conda_build.index.CHANNELDATA_VERSION`. (#5203) +* Remove `conda_build.index.REPODATA_JSON_FN`. (#5203) +* Remove `conda_build.index.REPODATA_FROM_PKGS_JSON_FN`. (#5203) +* Remove `conda_build.index.CHANNELDATA_FIELDS`. (#5203) +* Remove `conda_build.index._clear_newline_chars`. (#5203) +* Remove `conda_build.index._get_jinja2_environment`. (#5203) +* Remove `conda_build.index._maybe_write`. (#5203) +* Remove `conda_build.index._make_build_string`. (#5203) +* Remove `conda_build.index._warn_on_missing_dependencies`. (#5203) +* Remove `conda_build.index._cache_post_install_details`. (#5203) +* Remove `conda_build.index._cache_recipe`. (#5203) +* Remove `conda_build.index._cache_run_exports`. (#5203) +* Remove `conda_build.index._cache_icon`. (#5203) +* Remove `conda_build.index._make_subdir_index_html`. (#5203) +* Remove `conda_build.index._make_channeldata_index_html`. (#5203) +* Remove `conda_build.index._get_source_repo_git_info`. (#5203) +* Remove `conda_build.index._cache_info_file`. (#5203) +* Remove `conda_build.index._alternate_file_extension`. (#5203) +* Remove `conda_build.index._get_resolve_object`. (#5203) +* Remove `conda_build.index._get_newest_versions`. (#5203) +* Remove `conda_build.index._add_missing_deps`. (#5203) +* Remove `conda_build.index._add_prev_ver_for_features`. (#5203) +* Remove `conda_build.index._shard_newest_packages`. (#5203) +* Remove `conda_build.index._build_current_repodata`. (#5203) +* Remove `conda_build.index.ChannelIndex`. (#5203) +* Remove `conda_build.inspect.check_install('prepend')`. (#5203) +* Remove `conda_build.inspect.check_install('minimal_hint')`. (#5203) +* Remove `conda_build.noarch_python.ISWIN`. Use `conda_build.utils.on_win` instead. (#5203) +* Remove `conda_build.noarch_python._force_dir`. Use `os.makedirs(exist_ok=True)` instead. (#5203) +* Remove `conda_build.noarch_python._error_exit`. (#5203) +* Remove `conda_build.render.actions_to_pins`. (#5203) +* Remove `conda_build.utils.linked_data_no_multichannels`. (#5203) +* Mark `conda_build.api.get_output_file_path` as deprecated. Use `conda_build.api.get_output_file_paths` instead. (#5208) +* Mark `conda_build.environ.Environment` as deprecated. Use `conda.core.prefix_data.PrefixData` instead. (#5219) +* Mark `conda_build.conda_interface.get_version_from_git_tag` as deprecated. Use `conda_build.environ.get_version_from_git_tag` instead. (#5221) + +### Other + +* Added a check to print an additional warning and return an empty string when bits is "arm64" in msvc_env_cmd. (#4867) + +### Contributors + +* @beeankha +* @conda-bot +* @dholth +* @finnagin +* @kathatherine +* @kenodegard +* @mbargull +* @minrk +* @ryanskeith +* @travishathaway +* @pre-commit-ci[bot] + + + ## 24.1.2 (2024-02-15) ### Bug fixes diff --git a/news/4867-arm64-msvc-env-cmd-no-op b/news/4867-arm64-msvc-env-cmd-no-op deleted file mode 100644 index 134dcd14fd..0000000000 --- a/news/4867-arm64-msvc-env-cmd-no-op +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* Added a check to print an additional warning and return an empty string when bits is "arm64" in msvc_env_cmd. (#4867) diff --git a/news/5195-fix-stdlib-variant b/news/5195-fix-stdlib-variant deleted file mode 100644 index 526692f286..0000000000 --- a/news/5195-fix-stdlib-variant +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix stdlib being recognized in variant hash inputs. (#5190 via #5195) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5196-deprecate-bdist-conda b/news/5196-deprecate-bdist-conda deleted file mode 100644 index 3f37838bf0..0000000000 --- a/news/5196-deprecate-bdist-conda +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.bdist_conda` module as pending deprecation. (#5196) - -### Docs - -* - -### Other - -* diff --git a/news/5199-deprecate-have_prefix_files b/news/5199-deprecate-have_prefix_files deleted file mode 100644 index eccab010da..0000000000 --- a/news/5199-deprecate-have_prefix_files +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.build.have_prefix_files` as deprecated. (#5199) - -### Docs - -* - -### Other - -* diff --git a/news/5203-remove-deprecations b/news/5203-remove-deprecations deleted file mode 100644 index 5021c12907..0000000000 --- a/news/5203-remove-deprecations +++ /dev/null @@ -1,80 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.conda_interface.handle_proxy_407` as deprecated. Handled by `conda.gateways.connection.session.CondaSession`. (#5203) -* Mark `conda_build.conda_interface.hashsum_file` as deprecated. Use `conda.gateways.disk.read.compute_sum` instead. (#5203) -* Mark `conda_build.conda_interface.md5_file` as deprecated. Use `conda.gateways.disk.read.compute_sum(path, 'md5')` instead. (#5203) -* Mark `conda_build.environ.PREFIX_ACTION` as deprecated. (#5203) -* Mark `conda_build.environ.LINK_ACTION` as deprecated. (#5203) -* Mark `conda_build.environ.cache_actions` as deprecated. (#5203) -* Mark `conda_build.index.DummyExecutor` as deprecated. (#5203) -* Mark `conda_build.index.MAX_THREADS_DEFAULT` as deprecated. (#5203) -* Mark `conda_build.index.LOCK_TIMEOUT_SECS` as deprecated. (#5203) -* Mark `conda_build.index.LOCKFILE_NAME` as deprecated. (#5203) -* Postpone `conda_build.index.channel_data` deprecation. (#5203) -* Rename `conda_build.environ.create_env('specs_or_actions' -> 'specs_or_precs')`. (#5203) -* Rename `conda_build.environ._execute_actions('actions' -> 'precs'). (#5203) -* Rename `conda_build.environ._display_actions('actions' -> 'precs'). (#5203) -* Rename `conda_build.inspect.check_install('platform' -> 'subdir')`. (#5203) -* Rename `conda_build.render.execute_download_actions('actions' -> 'precs')`. (#5203) -* Rename `conda_build.render.get_upstream_pins('actions' -> 'precs')`. (#5203) -* Remove `conda_build.cli.main_render.execute(print_results)`. (#5203) -* Remove `conda_build.conda_interface.Dist`. (#5203) -* Remove `conda_build.conda_interface.display_actions`. (#5203) -* Remove `conda_build.conda_interface.execute_actions`. (#5203) -* Remove `conda_build.conda_interface.execute_plan`. (#5203) -* Remove `conda_build.conda_interface.install_actions`. (#5203) -* Remove `conda_build.conda_interface.linked`. (#5203) -* Remove `conda_build.conda_interface.linked_data`. (#5203) -* Remove `conda_build.conda_interface.package_cache`. (#5203) -* Remove `conda_build.environ.get_install_actions`. Use `conda_build.environ.get_package_records` instead. (#5203) -* Remove `conda_build.index._determine_namespace`. (#5203) -* Remove `conda_build.index._make_seconds`. (#5203) -* Remove `conda_build.index.REPODATA_VERSION`. (#5203) -* Remove `conda_build.index.CHANNELDATA_VERSION`. (#5203) -* Remove `conda_build.index.REPODATA_JSON_FN`. (#5203) -* Remove `conda_build.index.REPODATA_FROM_PKGS_JSON_FN`. (#5203) -* Remove `conda_build.index.CHANNELDATA_FIELDS`. (#5203) -* Remove `conda_build.index._clear_newline_chars`. (#5203) -* Remove `conda_build.index._get_jinja2_environment`. (#5203) -* Remove `conda_build.index._maybe_write`. (#5203) -* Remove `conda_build.index._make_build_string`. (#5203) -* Remove `conda_build.index._warn_on_missing_dependencies`. (#5203) -* Remove `conda_build.index._cache_post_install_details`. (#5203) -* Remove `conda_build.index._cache_recipe`. (#5203) -* Remove `conda_build.index._cache_run_exports`. (#5203) -* Remove `conda_build.index._cache_icon`. (#5203) -* Remove `conda_build.index._make_subdir_index_html`. (#5203) -* Remove `conda_build.index._make_channeldata_index_html`. (#5203) -* Remove `conda_build.index._get_source_repo_git_info`. (#5203) -* Remove `conda_build.index._cache_info_file`. (#5203) -* Remove `conda_build.index._alternate_file_extension`. (#5203) -* Remove `conda_build.index._get_resolve_object`. (#5203) -* Remove `conda_build.index._get_newest_versions`. (#5203) -* Remove `conda_build.index._add_missing_deps`. (#5203) -* Remove `conda_build.index._add_prev_ver_for_features`. (#5203) -* Remove `conda_build.index._shard_newest_packages`. (#5203) -* Remove `conda_build.index._build_current_repodata`. (#5203) -* Remove `conda_build.index.ChannelIndex`. (#5203) -* Remove `conda_build.inspect.check_install('prepend')`. (#5203) -* Remove `conda_build.inspect.check_install('minimal_hint')`. (#5203) -* Remove `conda_build.noarch_python.ISWIN`. Use `conda_build.utils.on_win` instead. (#5203) -* Remove `conda_build.noarch_python._force_dir`. Use `os.makedirs(exist_ok=True)` instead. (#5203) -* Remove `conda_build.noarch_python._error_exit`. (#5203) -* Remove `conda_build.render.actions_to_pins`. (#5203) -* Remove `conda_build.utils.linked_data_no_multichannels`. (#5203) - -### Docs - -* - -### Other - -* diff --git a/news/5208-deprecate-get_output_file_path b/news/5208-deprecate-get_output_file_path deleted file mode 100644 index 33244e8bf5..0000000000 --- a/news/5208-deprecate-get_output_file_path +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.api.get_output_file_path` as deprecated. Use `conda_build.api.get_output_file_paths` instead. (#5208) - -### Docs - -* - -### Other - -* diff --git a/news/5219-deprecate-Environment b/news/5219-deprecate-Environment deleted file mode 100644 index 95780c6be3..0000000000 --- a/news/5219-deprecate-Environment +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.environ.Environment` as deprecated. Use `conda.core.prefix_data.PrefixData` instead. (#5219) - -### Docs - -* - -### Other - -* diff --git a/news/5221-deprecate-get_version_from_git_tag b/news/5221-deprecate-get_version_from_git_tag deleted file mode 100644 index 2c1e811a54..0000000000 --- a/news/5221-deprecate-get_version_from_git_tag +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.conda_interface.get_version_from_git_tag` as deprecated. Use `conda_build.environ.get_version_from_git_tag` instead. (#5221) - -### Docs - -* - -### Other - -* diff --git a/news/5228-lief-0.14-compat b/news/5228-lief-0.14-compat deleted file mode 100644 index 602242c7d4..0000000000 --- a/news/5228-lief-0.14-compat +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Add compatibility for LIEF=0.14. (#5227 via #5228) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* From 6de4c71d5f438bdf124d52595b0e434488e7ab25 Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Fri, 15 Mar 2024 12:17:25 -0400 Subject: [PATCH 5/8] Add first-time contributions --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bbb72ce174..fc38b427e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -89,7 +89,7 @@ * @beeankha * @conda-bot * @dholth -* @finnagin +* @finnagin made their first contribution in https://github.com/conda/conda-build/pull/4867 * @kathatherine * @kenodegard * @mbargull From f71ac0d34ff7b9f5bc4a05ddad11117d60931934 Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Fri, 15 Mar 2024 12:24:29 -0400 Subject: [PATCH 6/8] Update mistaken commit increases --- .authors.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.authors.yml b/.authors.yml index 69afb31f6a..89d9a7ae00 100644 --- a/.authors.yml +++ b/.authors.yml @@ -8,7 +8,7 @@ aliases: - Mike Sarahan - Michael Sarahan - num_commits: 4002 + num_commits: 2001 first_commit: 2015-09-04 21:31:08 - name: Jonathan J. Helmus email: jjhelmus@gmail.com @@ -64,7 +64,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 @@ -118,7 +118,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 @@ -572,7 +572,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 @@ -755,7 +755,7 @@ alternate_emails: - kirkhamj@janelia.hhmi.org - jakirkham@gmail.com - num_commits: 148 + num_commits: 74 first_commit: 2015-04-21 13:26:39 github: jakirkham - name: Anthony Scopatz @@ -874,7 +874,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 @@ -968,7 +968,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: @@ -1121,7 +1121,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 From 68c798cfc774a2fcc43e0b9bdd044de37941b896 Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Fri, 15 Mar 2024 12:26:39 -0400 Subject: [PATCH 7/8] Add changelog item --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc38b427e9..07b5af9084 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,10 @@ * Mark `conda_build.environ.Environment` as deprecated. Use `conda.core.prefix_data.PrefixData` instead. (#5219) * Mark `conda_build.conda_interface.get_version_from_git_tag` as deprecated. Use `conda_build.environ.get_version_from_git_tag` instead. (#5221) +### Docs + +* Update advice for installing conda-build into base environment. (#5223) + ### Other * Added a check to print an additional warning and return an empty string when bits is "arm64" in msvc_env_cmd. (#4867) From a866a68dd8bf0b3302c6395cffde87dae03cd02e Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Fri, 15 Mar 2024 12:28:08 -0400 Subject: [PATCH 8/8] Update changelog grammar and formatting --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 07b5af9084..42d745f874 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,11 @@ ### Enhancements -* Add compatibility for LIEF=0.14. (#5227 via #5228) +* Add compatibility for `LIEF=0.14`. (#5227 via #5228) ### Bug fixes -* Fix stdlib being recognized in variant hash inputs. (#5190 via #5195) +* Fix `stdlib` being recognized in variant hash inputs. (#5190 via #5195) ### Deprecations @@ -86,7 +86,7 @@ ### Other -* Added a check to print an additional warning and return an empty string when bits is "arm64" in msvc_env_cmd. (#4867) +* Add a check to print an additional warning and return an empty string when bits is "arm64" in `msvc_env_cmd`. (#4867) ### Contributors