From 91d10fc7d1ba27fe97cb0e37fb4d60be6490c3b0 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Thu, 30 Nov 2023 23:43:28 -0500 Subject: [PATCH] Release 3.28.0 (#5090) --- .authors.yml | 36 ++++++++---- .mailmap | 4 +- AUTHORS.md | 2 + CHANGELOG.md | 72 ++++++++++++++++++++++++ news/5009-use-conda-known-subdirs | 24 -------- news/5015-ruff | 19 ------- news/5021-get_hash_input | 19 ------- news/5031-post-conda-5708-cleanup | 19 ------- news/5037-conda-libmamba-solver-pins | 19 ------- news/5039-dont-clobber-multiple-config | 19 ------- news/5040-codefile | 21 ------- news/5041-refactor-which_package | 32 ----------- news/5042-deprecate-relative | 19 ------- news/5050-missing-anaconda-client-bugfix | 19 ------- news/5052-ruff-format | 19 ------- news/5059-ci-conda-libmamba-solver | 19 ------- news/5066-fix-conda_index-log-spam | 19 ------- news/5067-use-conda-sphinx-theme | 20 ------- 18 files changed, 103 insertions(+), 298 deletions(-) delete mode 100644 news/5009-use-conda-known-subdirs delete mode 100644 news/5015-ruff delete mode 100644 news/5021-get_hash_input delete mode 100644 news/5031-post-conda-5708-cleanup delete mode 100644 news/5037-conda-libmamba-solver-pins delete mode 100644 news/5039-dont-clobber-multiple-config delete mode 100644 news/5040-codefile delete mode 100644 news/5041-refactor-which_package delete mode 100644 news/5042-deprecate-relative delete mode 100644 news/5050-missing-anaconda-client-bugfix delete mode 100644 news/5052-ruff-format delete mode 100644 news/5059-ci-conda-libmamba-solver delete mode 100644 news/5066-fix-conda_index-log-spam delete mode 100644 news/5067-use-conda-sphinx-theme diff --git a/.authors.yml b/.authors.yml index e0a69846c8..b70c534e36 100644 --- a/.authors.yml +++ b/.authors.yml @@ -20,7 +20,7 @@ email: isuruf@gmail.com alternate_emails: - isuru.11@cse.mrt.ac.lk - num_commits: 83 + num_commits: 84 first_commit: 2017-06-16 15:14:34 github: isuruf - name: Dan Blanchard @@ -611,7 +611,7 @@ first_commit: 2015-08-30 06:44:37 - name: Marcel Bargull email: marcel.bargull@udo.edu - num_commits: 73 + num_commits: 76 first_commit: 2016-09-26 11:45:54 github: mbargull alternate_emails: @@ -754,7 +754,7 @@ alternate_emails: - kirkhamj@janelia.hhmi.org - jakirkham@gmail.com - num_commits: 73 + num_commits: 74 first_commit: 2015-04-21 13:26:39 github: jakirkham - name: Anthony Scopatz @@ -1060,10 +1060,12 @@ first_commit: 2019-06-07 02:44:13 github: dbast - name: Duncan Macleod - email: duncan.macleod@ligo.org - num_commits: 6 + num_commits: 7 + email: duncanmmacleod+github@gmail.com first_commit: 2019-06-13 08:07:25 github: duncanmmacleod + alternate_emails: + - duncan.macleod@ligo.org - name: Chris Osborn email: csosborn@users.noreply.github.com num_commits: 1 @@ -1199,7 +1201,7 @@ alternate_emails: - clee@anaconda.com - name: Ken Odegard - num_commits: 133 + num_commits: 153 email: kodegard@anaconda.com first_commit: 2020-09-08 19:53:41 github: kenodegard @@ -1237,7 +1239,7 @@ github: pre-commit-ci[bot] aliases: - pre-commit-ci[bot] - num_commits: 52 + num_commits: 56 first_commit: 2021-11-20 01:47:17 - name: Jacob Walls email: jacobtylerwalls@gmail.com @@ -1259,7 +1261,7 @@ alternate_emails: - ad-team+condabot@anaconda.com - 18747875+conda-bot@users.noreply.github.com - num_commits: 38 + num_commits: 42 first_commit: 2022-01-17 18:09:22 - name: Uwe L. Korn email: xhochy@users.noreply.github.com @@ -1278,7 +1280,7 @@ - name: Travis Hathaway email: travis.j.hathaway@gmail.com github: travishathaway - num_commits: 2 + num_commits: 5 first_commit: 2022-05-12 05:53:02 - name: Kyle Leaders email: remkade@users.noreply.github.com @@ -1324,7 +1326,7 @@ - name: Jaime Rodríguez-Guerra email: jaimergp@users.noreply.github.com github: jaimergp - num_commits: 4 + num_commits: 7 first_commit: 2022-11-02 19:34:51 - name: Dave Clements email: tnabtaf@gmail.com @@ -1415,3 +1417,17 @@ github: scdub num_commits: 2 first_commit: 2023-08-18 02:53:28 +- name: Daniel Petry + email: dpetry@anaconda.com + github: danpetry + aliases: + - danpetry + num_commits: 1 + first_commit: 2023-11-02 13:57:57 +- name: H. Vetinari + email: h.vetinari@gmx.com + github: h-vetinari + aliases: + - h-vetinari + num_commits: 1 + first_commit: 2023-10-25 09:33:34 diff --git a/.mailmap b/.mailmap index 2f7457f813..34499e8009 100644 --- a/.mailmap +++ b/.mailmap @@ -70,6 +70,7 @@ Dan Lovell dlovell Daniel Bast <2790401+dbast@users.noreply.github.com> Daniel Damiani Daniel Holth +Daniel Petry danpetry Darren Dale Dave Clements Dave Hirschfeld David Hirschfeld @@ -80,7 +81,7 @@ Derek Ludwig Devon Ryan dpryan79 Diogo de Campos Dougal J. Sutherland -Duncan Macleod +Duncan Macleod Duncan Macleod Ed Campbell Eli Rykoff erykoff Elliot Hughes @@ -98,6 +99,7 @@ Geir Ove Myhr Greg Brener Guilherme Quentel Melo Guillaume Baty +H. Vetinari h-vetinari Harsh Gupta Harun Reşit Zafer Heather Kelly heather999 diff --git a/AUTHORS.md b/AUTHORS.md index cbfba08e20..7667f98c40 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -53,6 +53,7 @@ Authors are sorted alphabetically. * Daniel Bast * Daniel Damiani * Daniel Holth +* Daniel Petry * Darren Dale * Dave Clements * Dave Hirschfeld @@ -81,6 +82,7 @@ Authors are sorted alphabetically. * Greg Brener * Guilherme Quentel Melo * Guillaume Baty +* H. Vetinari * Harsh Gupta * Harun Reşit Zafer * Heather Kelly diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d14e6556f..35d3181c95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,77 @@ [//]: # (current developments) +## 3.28.0 (2023-11-30) + +### Special announcement + +In the upcoming January 2024 release of conda-build, significant changes are underway. We're set to transition to the [CalVer](https://calver.org/) versioning system. Additionally, we'll be formally embracing [CEP 8](https://github.com/conda-incubator/ceps/blob/main/cep-8.md) to manage our release schedule. Moreover, an expedited version of [CEP 9](https://github.com/conda-incubator/ceps/blob/main/cep-8.md) will be adopted for deprecation handling, omitting the pending deprecation phase and streamlining the period from deprecation to removal to a mere 2 months. + +### Enhancements + +* Add `stblib` jinja function similar to `compiler` to explicitly define sysroot dependencies. (#4999) +* Utilize conda-known subdirs for selector definitions, enabling conda_build to support new architectures with only an updated conda version. New OS support requires additional information for proper conda_build functionality, including UNIX-like platform designation, shared library prefix, and binary archive format for the platform. (#5009) +* Eliminate unnecessary cache clearing from `conda_build.build.test`. (#5031) +* Consolidate `which_package` implementations and replace `conda.models.dist.Dist` usage with `conda.models.records.PrefixRecords`. (#5041) + +### Bug fixes + +* Display package file name in `get_hash_input`. (#5021) +* Fall back to solved record filename to locate the downloaded tarball in `get_upstream_pins`. (#4991 via #5037) +* Prevent overwriting of variants in high priority cbc.yaml entries when absent in lower priority cbc.yamls. (#5039) +* Correct the check for a missing anaconda-client to display a useful error message. (#5050) +* Fix conda_index.index verbose DEBUG/INFO message logging. (#5066) + +### Deprecations + +* Mark `conda_build.environ.clean_pkg_cache` for pending deprecation. (#5031) +* Mark `conda_build.conda_interface.IndexRecord` for pending deprecation. Use `conda.models.records.PackageRecord` instead. (#5032) +* Mark `conda_build.os_utils.pyldd.is_string` for pending deprecation. Use `isinstance(value, str)` instead. (#5040) +* Mark `conda_build.os_utils.pyldd.is_codefile` for pending deprecation. Use `conda_build.os_utils.pyldd.codefile_class` instead. (#5040) +* Mark `conda_build.os_utils.pyldd.codefile_type` for pending deprecation. Use `conda_build.os_utils.pyldd.codefile_class` instead. (#5040) +* Mark `conda_build.inspect_pkg.dist_files` for pending deprecation. (#5041) +* Mark `conda_build.inspect_pkg.which_package(avoid_canonical_channel_name)` for pending deprecation. (#5041) +* Mark `conda_build.inspect_pkg._installed` for pending deprecation. (#5041) +* Mark `conda_build.os_utils.ldd.get_package_files` for pending deprecation. (#5041) +* Mark `conda_build.os_utils.pyldd.mach_o_change` for pending deprecation. (#5041) +* Mark `conda_build.os_utils.pyldd.inspect_rpath` for pending deprecation. (#5041) +* Mark `conda_build.os_utils.pyldd.get_runpaths` for pending deprecation. (#5041) +* Mark `conda_build.os_utils.pyldd.otool_sys` for pending deprecation. (#5041) +* Mark `conda_build.os_utils.pyldd.ldd_sys` for pending deprecation. (#5041) +* Mark `conda_build.post.determine_package_nature` for pending deprecation. Use `conda_build.post.get_dsos` and `conda_build.post.get_run_exports` instead. (#5041) +* Mark `conda_build.post.library_nature(subdir, bldpkgs_dirs, output_folder, channel_urls)` for pending deprecation. (#5041) +* Mark `conda_build.post.dist_from_names` for pending deprecation. Query `conda.core.prefix_data.PrefixData` instead. (#5041) +* Mark `conda_build.post.FakeDist` for pending deprecation. Use `conda.models.records.PrefixRecord` instead. (#5041) +* Mark `conda_build.post._get_fake_pkg_dist` for pending deprecation. Use `conda.models.records.PrefixRecord` instead. (#5041) +* Mark `conda_build.utils.relative` for pending deprecation. Use `os.path.relpath` or `pathlib.Path.relative_to` instead. (#5042) + +### Docs + +* Incorporate the conda-sphinx-theme into conda-build documentation. (#5067) +* Update certain pages to remove redundant TOC entries. (#5067) + +### Other + +* Implement Ruff linter in pre-commit configuration. (#5015) +* Replace `black` with `ruff format` in pre-commit setup. (#5052) +* Identify Unicode tests as incompatible with `libmamba`. (#5059) + + +### Contributors + +* @conda-bot +* @danpetry made their first contribution in https://github.com/conda/conda-build/pull/5039 +* @duncanmmacleod +* @h-vetinari made their first contribution in https://github.com/conda/conda-build/pull/4999 +* @isuruf +* @jaimergp +* @jakirkham +* @kenodegard +* @mbargull +* @travishathaway +* @pre-commit-ci[bot] + + + ## 3.27.0 (2023-09-26) ### Enhancements diff --git a/news/5009-use-conda-known-subdirs b/news/5009-use-conda-known-subdirs deleted file mode 100644 index a9423202f4..0000000000 --- a/news/5009-use-conda-known-subdirs +++ /dev/null @@ -1,24 +0,0 @@ -### Enhancements - -* Use subdirs known to conda for selector definitions. (#5009) - This allows conda_build to support new architectures with just - a new version of conda. For new OSes, there are more information - needed for conda_build to work properly, including whether the - new OS is a UNIX-like platform, the shared library prefix, and - the binary archive format for the platform. - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5015-ruff b/news/5015-ruff deleted file mode 100644 index a2ae3705d1..0000000000 --- a/news/5015-ruff +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* Use Ruff linter in pre-commit configuration. (#5015) diff --git a/news/5021-get_hash_input b/news/5021-get_hash_input deleted file mode 100644 index f92b78db55..0000000000 --- a/news/5021-get_hash_input +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Print package file name in `get_hash_input`. (#5021) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5031-post-conda-5708-cleanup b/news/5031-post-conda-5708-cleanup deleted file mode 100644 index f698066c97..0000000000 --- a/news/5031-post-conda-5708-cleanup +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Remove unnecessary cache clearing from `conda_buidl.build.test`. (#5031) - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.environ.clean_pkg_cache` as pending deprecation. (#5031) - -### Docs - -* - -### Other - -* diff --git a/news/5037-conda-libmamba-solver-pins b/news/5037-conda-libmamba-solver-pins deleted file mode 100644 index d4044fac0f..0000000000 --- a/news/5037-conda-libmamba-solver-pins +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fallback to solved record filename to find the downloaded tarball in `get_upstream_pins`. (#4991 via #5037) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5039-dont-clobber-multiple-config b/news/5039-dont-clobber-multiple-config deleted file mode 100644 index 630868093d..0000000000 --- a/news/5039-dont-clobber-multiple-config +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Avoid clobbering of variants in high priority cbc.yaml entries when they aren't present in lower priority cbc.yamls. (#5039) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5040-codefile b/news/5040-codefile deleted file mode 100644 index c4f85ca7cf..0000000000 --- a/news/5040-codefile +++ /dev/null @@ -1,21 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.os_utils.pyldd.is_string` as pending deprecation. Use `isinstance(value, str)` instead. (#5040) -* Mark `conda_build.os_utils.pyldd.is_codefile` as pending deprecation. Use `conda_build.os_utils.pyldd.codefile_class` instead. (#5040) -* Mark `conda_build.os_utils.pyldd.codefile_type` as pending deprecation. Use `conda_build.os_utils.pyldd.codefile_class` instead. (#5040) - -### Docs - -* - -### Other - -* diff --git a/news/5041-refactor-which_package b/news/5041-refactor-which_package deleted file mode 100644 index 0b060e3e51..0000000000 --- a/news/5041-refactor-which_package +++ /dev/null @@ -1,32 +0,0 @@ -### Enhancements - -* Consolidate `which_package` implementations and replacing `conda.models.dist.Dist` usage in favor of `conda.models.records.PrefixRecords`. (#5041) - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.inspect_pkg.dist_files` as pending deprecation. (#5041) -* Mark `conda_build.inspect_pkg.which_package(avoid_canonical_channel_name)` as pending deprecation. (#5041) -* Mark `conda_build.inspect_pkg._installed` as pending deprecation. (#5041) -* Mark `conda_build.os_utils.ldd.get_package_files` as pending deprecation. (#5041) -* Mark `conda_build.os_utils.pyldd.mach_o_change` as pending deprecation. (#5041) -* Mark `conda_build.os_utils.pyldd.inspect_rpath` as pending deprecation. (#5041) -* Mark `conda_build.os_utils.pyldd.get_runpaths` as pending deprecation. (#5041) -* Mark `conda_build.os_utils.pyldd.otool_sys` as pending deprecation. (#5041) -* Mark `conda_build.os_utils.pyldd.ldd_sys` as pending deprecation. (#5041) -* Mark `conda_build.post.determine_package_nature` as pending deprecation. Use `conda_build.post.get_dsos` and `conda_build.post.get_run_exports` instead. (#5041) -* Mark `conda_build.post.library_nature(subdir, bldpkgs_dirs, output_folder, channel_urls)` as pending deprecation. (#5041) -* Mark `conda_build.post.dist_from_names` as pending deprecation. Query `conda.core.prefix_data.PrefixData` instead. (#5041) -* Mark `conda_build.post.FakeDist` as pending deprecation. Use `conda.models.records.PrefixRecord` instead. (#5041) -* Mark `conda_build.post._get_fake_pkg_dist` as pending deprecation. Use `conda.models.records.PrefixRecord` instead. (#5041) - -### Docs - -* - -### Other - -* diff --git a/news/5042-deprecate-relative b/news/5042-deprecate-relative deleted file mode 100644 index 2061f242b2..0000000000 --- a/news/5042-deprecate-relative +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Mark `conda_build.utils.relative` as pending deprecation. Use `os.path.relpath` or `pathlib.Path.relative_to` instead. (#5042) - -### Docs - -* - -### Other - -* diff --git a/news/5050-missing-anaconda-client-bugfix b/news/5050-missing-anaconda-client-bugfix deleted file mode 100644 index 99df06709d..0000000000 --- a/news/5050-missing-anaconda-client-bugfix +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fixes the check for a missing anaconda-client so a useful error message is shown - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5052-ruff-format b/news/5052-ruff-format deleted file mode 100644 index ae88f823e9..0000000000 --- a/news/5052-ruff-format +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* Replace `black` with `ruff format` in pre-commit. (#5052) diff --git a/news/5059-ci-conda-libmamba-solver b/news/5059-ci-conda-libmamba-solver deleted file mode 100644 index daf2d919bf..0000000000 --- a/news/5059-ci-conda-libmamba-solver +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* Mark Unicode tests as incompatible with `libmamba`. (#5059) diff --git a/news/5066-fix-conda_index-log-spam b/news/5066-fix-conda_index-log-spam deleted file mode 100644 index aceb93cc2a..0000000000 --- a/news/5066-fix-conda_index-log-spam +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix conda_index.index verbose DEBUG/INFO message logging. (#5066) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5067-use-conda-sphinx-theme b/news/5067-use-conda-sphinx-theme deleted file mode 100644 index da1257358b..0000000000 --- a/news/5067-use-conda-sphinx-theme +++ /dev/null @@ -1,20 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* Adds the conda-sphinx-theme to conda-build documentation -* Updates some pages to remove redundant TOC - -### Other - -*