Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 24.5.x back into main #5334

Merged
merged 2 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@
first_commit: 2015-08-30 06:44:37
- name: Marcel Bargull
email: marcel.bargull@udo.edu
num_commits: 85
num_commits: 87
first_commit: 2016-09-26 11:45:54
github: mbargull
alternate_emails:
Expand Down Expand Up @@ -1202,7 +1202,7 @@
alternate_emails:
- clee@anaconda.com
- name: Ken Odegard
num_commits: 178
num_commits: 203
email: kodegard@anaconda.com
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand Down Expand Up @@ -1240,7 +1240,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 64
num_commits: 71
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: jacobtylerwalls@gmail.com
Expand All @@ -1251,7 +1251,7 @@
github: beeankha
alternate_emails:
- beeankha@gmail.com
num_commits: 23
num_commits: 27
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: 18747875+conda-bot@users.noreply.github.com
Expand All @@ -1262,7 +1262,7 @@
alternate_emails:
- ad-team+condabot@anaconda.com
- 18747875+conda-bot@users.noreply.github.com
num_commits: 96
num_commits: 53
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: xhochy@users.noreply.github.com
Expand Down Expand Up @@ -1310,7 +1310,7 @@
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
github: dependabot[bot]
num_commits: 4
num_commits: 19
first_commit: 2022-05-31 04:34:40
- name: Serhii Kupriienko
email: 79282962+skupr-anaconda@users.noreply.github.com
Expand All @@ -1327,7 +1327,7 @@
- name: Jaime Rodríguez-Guerra
email: jaimergp@users.noreply.github.com
github: jaimergp
num_commits: 10
num_commits: 13
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: tnabtaf@gmail.com
Expand Down Expand Up @@ -1439,3 +1439,18 @@
num_commits: 1
first_commit: 2024-02-06 11:43:45
github: finnagin
- name: Justin Wood (Callek)
email: callek@gmail.com
num_commits: 1
first_commit: 2024-04-29 16:21:41
github: Callek
- name: Tobias Fischer
email: info@tobiasfischer.info
num_commits: 1
first_commit: 2024-03-25 13:13:16
github: Tobias-Fischer
- name: Yannik Tausch
email: dev@ytausch.de
num_commits: 5
first_commit: 2024-03-19 18:09:38
github: ytausch
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ Joseph Hunkeler <jhunkeler@gmail.com>
Juan Lasheras <juan.lasheras@gmail.com> jlas <juan.lasheras@gmail.com>
Julian Rüth <julian.rueth@fsfe.org>
Julien Schueller <schueller@phimeca.com>
Justin Wood (Callek) <callek@gmail.com>
Jürgen Gmach <juergen.gmach@googlemail.com> Jürgen Gmach <juergen.gmach@canonical.com>
Jędrzej Nowak <pigmej@gmail.com> Jedrzej Nowak <pigmej@gmail.com>
Kai Tietz <ktietz@anaconda.com> Kai Tietz <47363620+katietz@users.noreply.github.com>
Expand Down Expand Up @@ -259,6 +260,7 @@ Thomas A Caswell <tcaswell@gmail.com> Thomas A Caswell <tcaswell@bnl.gov>
Thomas Holder <thomas.holder@schrodinger.com>
Thomas Kluyver <takowl@gmail.com>
Tim Snyder <snyder.tim@gmail.com>
Tobias Fischer <info@tobiasfischer.info>
Todd Tomashek <todd.m.tomashek@intel.com> tomashek <todd.m.tomashek@intel.com>
Todd Tomashek <todd.m.tomashek@intel.com> todd.m.tomashek <todd.m.tomashek@intel.com>
Tom Davidson <tjd@alum.mit.edu>
Expand All @@ -278,6 +280,7 @@ Wim Glenn <wim.glenn@gmail.com> wim glenn <wim.glenn@gmail.com>
Wolf Vollprecht <w.vollprecht@gmail.com>
Wolfgang Ulmer <wolfgang.Ulmer@de.bosch.com>
Yann <yannpaul@bu.edu>
Yannik Tausch <dev@ytausch.de>
Yoav Ram <yoavram+github@gmail.com>
Yu Feng <rainwoodman@gmail.com>
Zane Dufour <zane.dufour@gmail.com> zdog234 <zane.dufour@gmail.com>
Expand Down
3 changes: 3 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ Authors are sorted alphabetically.
* Juan Lasheras
* Julian Rüth
* Julien Schueller
* Justin Wood (Callek)
* Jürgen Gmach
* Jędrzej Nowak
* Kai Tietz
Expand Down Expand Up @@ -217,6 +218,7 @@ Authors are sorted alphabetically.
* Thomas Holder
* Thomas Kluyver
* Tim Snyder
* Tobias Fischer
* Todd Tomashek
* Tom Davidson
* Tom Pollard
Expand All @@ -235,6 +237,7 @@ Authors are sorted alphabetically.
* Wolf Vollprecht
* Wolfgang Ulmer
* Yann
* Yannik Tausch
* Yoav Ram
* Yu Feng
* Zane Dufour
Expand Down
131 changes: 131 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,136 @@
[//]: # (current developments)

## 24.5.0 (2024-05-06)

### Enhancements

* Only fetch `lfs` files for specific `git_ref`. (#5202)
* Add `conda_build.metadata._split_line_selector` to cache line-selector parsed text. (#5237)
* Add `conda_build.render.open_recipe` context manager to detect the recipe type (file/`meta.yaml`, directory/recipe, or tarball/package) and properly handling any exit/close behavior. (#5238)
* For Windows users, the stub executables used for Python entrypoints in packages are now codesigned. (#5252)
* Require `conda >=23.7.0`. (#5271)

### Bug fixes

* Fix all CLI arguments to properly initialize `conda.base.context.context` with parsed arguments. Fixes issue with arguments not being processed (e.g., `--override-channels` was previously ignored). (#3693 via #5271)

### Deprecations

* Deprecate `conda_build.conda_interface.CONDA_VERSION` constant. Use `conda.__version__` instead. (#5222)
* Deprecate `conda_build.conda_interface.binstar_upload` constant. Use `conda.base.context.context.binstar_upload` instead. (#5222)
* Deprecate `conda_build.conda_interface.default_python` constant. Use `conda.base.context.context.default_python` instead. (#5222)
* Deprecate `conda_build.conda_interface.envs_dirs` constant. Use `conda.base.context.context.envs_dirs` instead. (#5222)
* Deprecate `conda_build.conda_interface.pkgs_dirs` constant. Use `conda.base.context.context.pkgs_dirs` instead. (#5222)
* Deprecate `conda_build.conda_interface.cc_platform` constant. Use `conda.base.context.context.platform` instead. (#5222)
* Deprecate `conda_build.conda_interface.root_dir` constant. Use `conda.base.context.context.root_prefix` instead. (#5222)
* Deprecate `conda_build.conda_interface.root_writable` constant. Use `conda.base.context.context.root_writable` instead. (#5222)
* Deprecate `conda_build.conda_interface.subdir` constant. Use `conda.base.context.context.subdir` instead. (#5222)
* Deprecate `conda_build.conda_interface.create_default_packages` constant. Use `conda.base.context.context.create_default_packages` instead. (#5222)
* Deprecate `conda_build.conda_interface.get_rc_urls` function. Use `conda.base.context.context.channels` instead. (#5222)
* Deprecate `conda_build.conda_interface.get_prefix` function. Use `conda.base.context.context.target_prefix` instead. (#5222)
* Deprecate `conda_build.conda_interface.get_conda_channel` function. Use `conda.models.channel.Channel.from_value` instead. (#5222)
* Deprecate `conda_build.conda_interface.reset_context` function. Use `conda.base.context.reset_context` instead. (#5222)
* Deprecate `conda_build.conda_interface.context` singleton. Use `conda.base.context.context` instead. (#5251)
* Deprecate `conda_build.conda_interface.configparser` module. Use `configparser` instead. (#5251)
* Deprecate `conda_build.conda_interface.os` module. Use `os` instead. (#5251)
* Deprecate `conda_build.conda_interface.partial` function. Use `functools.partial` instead. (#5251)
* Deprecate `conda_build.conda_interface.import_module` function. Use `importlib.import_module` instead. (#5251)
* Deprecate `conda_build.conda_interface.determine_target_prefix` function. Use `conda.base.context.determine_target_prefix` instead. (#5251)
* Deprecate `conda_build.conda_interface.non_x86_linux_machines` constant. Use `conda.base.context.non_x86_machines` instead. (#5251)
* Deprecate `conda_build.conda_interface.ProgressiveFetchExtract` class. Use `conda.core.package_cache.ProgressiveFetchExtract` instead. (#5251)
* Deprecate `conda_build.conda_interface.CondaError` class. Use `conda.exceptions.CondaError` instead. (#5251)
* Deprecate `conda_build.conda_interface.CondaHTTPError` class. Use `conda.exceptions.CondaHTTPError` instead. (#5251)
* Deprecate `conda_build.conda_interface.LinkError` class. Use `conda.exceptions.LinkError` instead. (#5251)
* Deprecate `conda_build.conda_interface.LockError` class. Use `conda.exceptions.LockError` instead. (#5251)
* Deprecate `conda_build.conda_interface.NoPackagesFoundError` class. Use `conda.exceptions.NoPackagesFoundError` instead. (#5251)
* Deprecate `conda_build.conda_interface.PaddingError` class. Use `conda.exceptions.PaddingError` instead. (#5251)
* Deprecate `conda_build.conda_interface.UnsatisfiableError` class. Use `conda.exceptions.UnsatisfiableError` instead. (#5251)
* Deprecate `conda_build.conda_interface.get_conda_build_local_url` class. Use `conda.models.channel.get_conda_build_local_url` instead. (#5251)
* Deprecate `conda_build.config.Config.override_channels`. Defer to `conda.base.context.context.channels` instead. (#5271, #5324)
* Deprecate `conda_build.conda_interface._toposort`. Use `conda.common.toposort._toposort` instead. (#5276)
* Deprecate `conda_build.conda_interface.add_parser_channels`. Use `conda.cli.helpers.add_parser_channels` instead. (#5276)
* Deprecate `conda_build.conda_interface.add_parser_prefix`. Use `conda.cli.helpers.add_parser_prefix` instead. (#5276)
* Deprecate `conda_build.conda_interface.ArgumentParser`. Use `conda.cli.conda_argparse.ArgumentParser` instead. (#5276)
* Deprecate `conda_build.conda_interface.cc_conda_build`. Use `conda.base.context.context.conda_build` instead. (#5276)
* Deprecate `conda_build.conda_interface.Channel`. Use `conda.models.channel.Channel` instead. (#5276)
* Deprecate `conda_build.conda_interface.Completer`. Unused. (#5276)
* Deprecate `conda_build.conda_interface.CondaSession`. Use `conda.gateways.connection.session.CondaSession` instead. (#5276)
* Deprecate `conda_build.conda_interface.download`. Use `conda.gateways.connection.download.download` instead. (#5276)
* Deprecate `conda_build.conda_interface.EntityEncoder`. Use `conda.auxlib.entity.EntityEncoder` instead. (#5276)
* Deprecate `conda_build.conda_interface.env_path_backup_var_exists`. Unused. (#5276)
* Deprecate `conda_build.conda_interface.FileMode`. Use `conda.models.enums.FileMode` instead. (#5276)
* Deprecate `conda_build.conda_interface.human_bytes`. Use `conda.utils.human_bytes` instead. (#5276)
* Deprecate `conda_build.conda_interface.input`. Use `input` instead. (#5276)
* Deprecate `conda_build.conda_interface.InstalledPackages`. Unused. (#5276)
* Deprecate `conda_build.conda_interface.lchmod`. Use `conda.gateways.disk.link.lchmod` instead. (#5276)
* Deprecate `conda_build.conda_interface.MatchSpec`. Use `conda.models.match_spec.MatchSpec` instead. (#5276)
* Deprecate `conda_build.conda_interface.NoPackagesFound`. Use `conda.exceptions.ResolvePackageNotFound` instead. (#5276)
* Deprecate `conda_build.conda_interface.normalized_version`. Use `conda.models.version.normalized_version` instead. (#5276)
* Deprecate `conda_build.conda_interface.PackageRecord`. Use `conda.models.records.PackageRecord` instead. (#5276)
* Deprecate `conda_build.conda_interface.PathType`. Use `conda.models.enums.PathType` instead. (#5276)
* Deprecate `conda_build.conda_interface.prefix_placeholder`. Use `conda.base.constants.PREFIX_PLACEHOLDER` instead. (#5276)
* Deprecate `conda_build.conda_interface.Resolve`. Use `conda.resolve.Resolve` instead. (#5276)
* Deprecate `conda_build.conda_interface.rm_rf`. Use `conda_build.utils.rm_rf` instead. (#5276)
* Deprecate `conda_build.conda_interface.spec_from_line`. Use `conda.cli.common.spec_from_line` instead. (#5276)
* Deprecate `conda_build.conda_interface.specs_from_args`. Use `conda.cli.common.specs_from_args` instead. (#5276)
* Deprecate `conda_build.conda_interface.specs_from_url`. Use `conda.cli.common.specs_from_url` instead. (#5276)
* Deprecate `conda_build.conda_interface.StringIO`. Use `io.StringIO` instead. (#5276)
* Deprecate `conda_build.conda_interface.symlink_conda`. Unused. (#5276)
* Deprecate `conda_build.conda_interface.TempDirectory`. Use `conda.gateways.disk.create.TemporaryDirectory` instead. (#5276)
* Deprecate `conda_build.conda_interface.TmpDownload`. Use `conda.gateways.connection.download.TmpDownload` instead. (#5276)
* Deprecate `conda_build.conda_interface.unix_path_to_win`. Use `conda.utils.unix_path_to_win` instead. (#5276)
* Deprecate `conda_build.conda_interface.Unsatisfiable`. Use `conda.exceptions.UnsatisfiableError` instead. (#5276)
* Deprecate `conda_build.conda_interface.untracked`. Use `conda.misc.untracked` instead. (#5276)
* Deprecate `conda_build.conda_interface.url_path`. Use `conda.utils.url_path` instead. (#5276)
* Deprecate `conda_build.conda_interface.VersionOrder`. Use `conda.models.version.VersionOrder` instead. (#5276)
* Deprecate `conda_build.conda_interface.walk_prefix`. Use `conda.misc.walk_prefix` instead. (#5276)
* Deprecate `conda_build.conda_interface.win_path_to_unix`. Use `conda.common.path.win_path_to_unix` instead. (#5276)
* Deprecate `conda_build.variants.get_vars(loop_only)`. (#5280)
* Deprecate `conda_build.utils.HashableDict`. Use `frozendict.deepfreeze` instead. (#5284)
* Deprecate `conda_build.utils._convert_lists_to_sets`. Use `frozendict.deepfreeze` instead. (#5284)
* Deprecate `conda_build.utils.represent_hashabledict`. Use `frozendict.deepfreeze` instead. (#5284)
* Deprecate `conda_build.config.noarch_python_build_age_default`. (#5298)
* Postpone `conda_build.index.channel_data` deprecation. (#5299)
* Remove `conda_build.api.get_output_file_path`. Use `conda_build.api.get_output_file_paths` instead. (#5299)
* Remove `conda_build.bdist_conda`. (#5299)
* Remove `conda_build.build.have_prefix_files`. (#5299)
* Remove `conda_build.conda_interface.get_index`. Use `conda.core.index.get_index` instead. (#5299)
* Remove `conda_build.conda_interface.get_version_from_git_tag`. Use `conda_build.environ.get_version_from_git_tag` instead. (#5299)
* Remove `conda_build.conda_interface.handle_proxy_407`. Handled by `conda.gateways.connection.session.CondaSession`. (#5299)
* Remove `conda_build.conda_interface.hashsum_file`. Use `conda.gateways.disk.read.compute_sum` instead. (#5299)
* Remove `conda_build.conda_interface.md5_file`. Use `conda.gateways.disk.read.compute_sum(path, 'md5')` instead. (#5299)
* Remove `conda_build.environ._load_all_json`. (#5299)
* Remove `conda_build.environ._load_json`. (#5299)
* Remove `conda_build.environ.cached_actions`. (#5299)
* Remove `conda_build.environ.Environment`. Use `conda.core.prefix_data.PrefixData` instead. (#5299)
* Remove `conda_build.environ.InvalidEnvironment`. (#5299)
* Remove `conda_build.environ.LINK_ACTION`. (#5299)
* Remove `conda_build.environ.PREFIX_ACTION`. (#5299)
* Remove `conda_build.index._apply_instructions`. Use `conda_index._apply_instructions` instead. (#5299)
* Remove `conda_build.index.DummyExecutor`. (#5299)
* Remove `conda_build.index.LOCK_TIMEOUT_SECS`. (#5299)
* Remove `conda_build.index.LOCKFILE_NAME`. (#5299)
* Remove `conda_build.index.MAX_THREADS_DEFAULT`. (#5299)

### Other

* Enable CodSpeed benchmarks for select tests. (#5233)

### Contributors

* @beeankha
* @conda-bot
* @jaimergp
* @Callek made their first contribution in https://github.com/conda/conda-build/pull/5252
* @kenodegard
* @mbargull
* @Tobias-Fischer made their first contribution in https://github.com/conda/conda-build/pull/5202
* @ytausch made their first contribution in https://github.com/conda/conda-build/pull/5214
* @dependabot[bot]
* @pre-commit-ci[bot]



## 24.3.0 (2024-03-15)

### Enhancements
Expand Down
8 changes: 5 additions & 3 deletions conda_build/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -781,10 +781,12 @@ def subdirs_same(self):
@deprecated(
"24.5",
"24.7",
addendum="Use `conda.base.context.context.override_channels` instead.",
addendum="Defer to `conda.base.context.context.channels` instead.",
)
def override_channels(self):
return context.override_channels
def override_channels(self) -> bool:
return bool(
context._argparse_args and context._argparse_args.get("override_channels")
)

def clean(self, remove_folders=True):
# build folder is the whole burrito containing envs and source folders
Expand Down
32 changes: 0 additions & 32 deletions news/5222-deprecating-conda_interface

This file was deleted.

19 changes: 0 additions & 19 deletions news/5233-enable-codspeed

This file was deleted.

19 changes: 0 additions & 19 deletions news/5237-select_lines-caching

This file was deleted.

19 changes: 0 additions & 19 deletions news/5238-open_recipe

This file was deleted.

Loading
Loading