From 11cd27df122c3d8658697b83e60dad5fba8c8cec Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Thu, 14 Nov 2024 14:03:41 -0500 Subject: [PATCH 1/4] Update check_output() call in tests.yml (#5537) --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3bd38b9e89..37dcf02c84 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -563,7 +563,7 @@ jobs: # to override the version with a derivative of the branch name # override the version if `git describe --tag` does not start with the branch version - last_release = check_output(["git", "describe", "--tag"]) + last_release = check_output(["git", "describe", "--tag"], text=True).strip() prefix = "${{ github.ref_name }}"[:-1] # without x suffix if not last_release.startswith(prefix): envs["VERSION_OVERRIDE"] = "${{ github.ref_name }}" From e70a6d0da668c4c6220f1fac8a1be108080a7499 Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Mon, 18 Nov 2024 13:33:24 -0500 Subject: [PATCH 2/4] Changelog 24.11.0 (#5540) --- .authors.yml | 24 ++++----- CHANGELOG.md | 49 +++++++++++++++++++ news/4890-package-format-cli-options | 22 --------- news/5479-better-document-run_test.r | 19 ------- .../5497-deprecate-UnableToParseMissingJinja2 | 19 ------- ...path-can-be-specified-in-the-build-section | 19 ------- ...-deprecate-get_build_index-locking-timeout | 20 -------- news/5514-better-jinja2-regex.rst | 19 ------- news/5517-fix-skeleton-patch.rst | 19 ------- news/5518-fix-docs-build.rst | 19 ------- news/5525-py38 | 19 ------- news/5528-jinja2-first-pass.rst | 19 ------- news/5534-warn-default-conda-pkg-format | 19 ------- news/5535-fix-variant-finding.rst | 21 -------- 14 files changed, 61 insertions(+), 246 deletions(-) delete mode 100644 news/4890-package-format-cli-options delete mode 100644 news/5479-better-document-run_test.r delete mode 100644 news/5497-deprecate-UnableToParseMissingJinja2 delete mode 100644 news/5502-python_site_packages_path-can-be-specified-in-the-build-section delete mode 100644 news/5508-deprecate-get_build_index-locking-timeout delete mode 100644 news/5514-better-jinja2-regex.rst delete mode 100644 news/5517-fix-skeleton-patch.rst delete mode 100644 news/5518-fix-docs-build.rst delete mode 100644 news/5525-py38 delete mode 100644 news/5528-jinja2-first-pass.rst delete mode 100644 news/5534-warn-default-conda-pkg-format delete mode 100644 news/5535-fix-variant-finding.rst diff --git a/.authors.yml b/.authors.yml index eeb7d860b4..a7fd86b592 100644 --- a/.authors.yml +++ b/.authors.yml @@ -14,7 +14,7 @@ email: jjhelmus@gmail.com aliases: - Jonathan Helmus - num_commits: 110 + num_commits: 111 first_commit: 2014-06-09 17:25:05 github: jjhelmus - name: Isuru Fernando @@ -370,7 +370,7 @@ github: ClinicalGraphics - name: John Blischak email: jdblischak@gmail.com - num_commits: 11 + num_commits: 12 first_commit: 2017-08-11 13:23:55 github: jdblischak - name: Floris Bruynooghe @@ -1121,7 +1121,7 @@ alternate_emails: - becker.mr@gmail.com - beckermr@users.noreply.github.com - num_commits: 22 + num_commits: 27 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: 220 + num_commits: 227 email: kodegard@anaconda.com first_commit: 2020-09-08 19:53:41 github: kenodegard @@ -1225,7 +1225,7 @@ first_commit: 2020-11-19 10:46:41 - name: Jannis Leidel email: jannis@leidel.info - num_commits: 32 + num_commits: 34 github: jezdez first_commit: 2020-11-19 10:46:41 - name: Christof Kaufmann @@ -1240,7 +1240,7 @@ github: pre-commit-ci[bot] aliases: - pre-commit-ci[bot] - num_commits: 86 + num_commits: 95 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: 43 + num_commits: 39 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: 62 + num_commits: 66 first_commit: 2022-01-17 18:09:22 - name: Uwe L. Korn email: xhochy@users.noreply.github.com @@ -1310,7 +1310,7 @@ - name: dependabot[bot] email: 49699333+dependabot[bot]@users.noreply.github.com github: dependabot[bot] - num_commits: 35 + num_commits: 37 first_commit: 2022-05-31 04:34:40 - name: Serhii Kupriienko email: 79282962+skupr-anaconda@users.noreply.github.com @@ -1327,7 +1327,7 @@ - name: Jaime Rodríguez-Guerra email: jaimergp@users.noreply.github.com github: jaimergp - num_commits: 17 + num_commits: 20 first_commit: 2022-11-02 19:34:51 - name: Dave Clements email: tnabtaf@gmail.com @@ -1376,7 +1376,7 @@ aliases: - Ryan github: ryanskeith - num_commits: 6 + num_commits: 7 first_commit: 2023-03-22 03:11:02 - name: Rishabh Singh email: 67859818+rishabh11336@users.noreply.github.com @@ -1461,7 +1461,7 @@ github: timkpaine - name: Klaus Zimmermann email: klaus.zimmermann@quansight.com - num_commits: 2 + num_commits: 3 first_commit: 2024-06-07 10:02:14 github: zklaus - name: Daniel Ching diff --git a/CHANGELOG.md b/CHANGELOG.md index 80e4756c77..b73549f82c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,54 @@ [//]: # (current developments) +## 24.11.0 (2024-11-15) + +### Enhancements + +* Introduce `--package-format` as a command line argument. (#4890 via #5209) + * This takes precedence over default value and `condarc`. + * Normalization occurs so `1`, `"1"`, `tar.bz2`,`.tar.bz2`, `2`, `"2"`, `conda`, `.conda` are all recognized and mapped appropriately. + * Other options are rejected. +* Add support for [CEP-17](https://github.com/conda/ceps/blob/main/cep-0017.md) that allows specifying the location of the site-packages directory with the `python_site_packages_path` build option for any packages named `python`. (#5502) + +### Bug fixes + +* Fix regex for Jinja2 `set` / `for` statements to be more specific. (#5514) +* Fix `ruamel.yaml` usage to use supported APIs. (#5517) +* Fix bug variant variables were not defined for the first parsing pass of a recipe. (#5528) +* Fix a bug where variants were incorrectly found as being used when they matched a leading substring of + another variant. (#5535) +* Fix a bug where variants were not found when variables were used in `pin_*` statements. (#5535) + +### Deprecations + +* Deprecate `conda_build.exceptions.UnableToParseMissingJinja2`. (#5497) +* Deprecate `conda_build.index.get_build_index(locking)`. (#5508) +* Deprecate `conda_build.index.get_build_index(timeout)`. (#5508) +* Require Python 3.9 or greater. (#5525) +* The default value for `--package-format` and `conda_pkg_format` will become `.conda` in 25.1. (#5534) + +### Docs + +* Better document `run_test.r`. (#5479) +* Fix bug in docs build by pinning `conda-sphinx-theme` version to 0.2.2. (#5518) + +### Contributors + +* @beeankha +* @conda-bot +* @jaimergp +* @jezdez +* @jdblischak +* @jjhelmus +* @kenodegard +* @zklaus +* @beckermr +* @ryanskeith +* @dependabot[bot] +* @pre-commit-ci[bot] + + + ## 24.9.0 (2024-09-18) ### Enhancements diff --git a/news/4890-package-format-cli-options b/news/4890-package-format-cli-options deleted file mode 100644 index 3bfff08744..0000000000 --- a/news/4890-package-format-cli-options +++ /dev/null @@ -1,22 +0,0 @@ -### Enhancements - -* `--package-format` introduced as command line argument. (#4890 via #5209) - * This takes precedence over default value and `condarc`. - * Normalization occurs so `1`, `"1"`, `tar.bz2`,`.tar.bz2`, `2`, `"2"`, `conda`, `.conda` are all recognized and mapped appropriately. - * Other options are rejected. - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5479-better-document-run_test.r b/news/5479-better-document-run_test.r deleted file mode 100644 index 233a61bd96..0000000000 --- a/news/5479-better-document-run_test.r +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* Better document `run_test.r`. (#5479) - -### Other - -* diff --git a/news/5497-deprecate-UnableToParseMissingJinja2 b/news/5497-deprecate-UnableToParseMissingJinja2 deleted file mode 100644 index 2093d8dc7f..0000000000 --- a/news/5497-deprecate-UnableToParseMissingJinja2 +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Deprecate `conda_build.exceptions.UnableToParseMissingJinja2`. (#5497) - -### Docs - -* - -### Other - -* diff --git a/news/5502-python_site_packages_path-can-be-specified-in-the-build-section b/news/5502-python_site_packages_path-can-be-specified-in-the-build-section deleted file mode 100644 index 1e6ab3a657..0000000000 --- a/news/5502-python_site_packages_path-can-be-specified-in-the-build-section +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* Add support for CEP-17 that allows specifying the location of the site-packages directory with the `python_site_packages_path` build option for any packages named `python`. (#5502) - -### Bug fixes - -* - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5508-deprecate-get_build_index-locking-timeout b/news/5508-deprecate-get_build_index-locking-timeout deleted file mode 100644 index 23cd357420..0000000000 --- a/news/5508-deprecate-get_build_index-locking-timeout +++ /dev/null @@ -1,20 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Deprecate `conda_build.index.get_build_index(locking)`. (#5508) -* Deprecate `conda_build.index.get_build_index(timeout)`. (#5508) - -### Docs - -* - -### Other - -* diff --git a/news/5514-better-jinja2-regex.rst b/news/5514-better-jinja2-regex.rst deleted file mode 100644 index 873be2f9f0..0000000000 --- a/news/5514-better-jinja2-regex.rst +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fixed regex for Jinja2 `set` / `for` statements to be more specific. (#5514) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5517-fix-skeleton-patch.rst b/news/5517-fix-skeleton-patch.rst deleted file mode 100644 index da4b38f9a6..0000000000 --- a/news/5517-fix-skeleton-patch.rst +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fixed ruamel.yaml usage to use supported APIs. (#5517) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5518-fix-docs-build.rst b/news/5518-fix-docs-build.rst deleted file mode 100644 index 7a10ba7d92..0000000000 --- a/news/5518-fix-docs-build.rst +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fixed bug in docs build by pinning conda-sphinx-theme to 0.2.2. (#5518) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5525-py38 b/news/5525-py38 deleted file mode 100644 index 4ddc1664ed..0000000000 --- a/news/5525-py38 +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* Require Python 3.9 or greater. (#5525) - -### Docs - -* - -### Other - -* diff --git a/news/5528-jinja2-first-pass.rst b/news/5528-jinja2-first-pass.rst deleted file mode 100644 index 19f7f6bd6e..0000000000 --- a/news/5528-jinja2-first-pass.rst +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fixed bug variant variables were not defined for the first parsing pass of a recipe. (#5528) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5534-warn-default-conda-pkg-format b/news/5534-warn-default-conda-pkg-format deleted file mode 100644 index e60dbefc3d..0000000000 --- a/news/5534-warn-default-conda-pkg-format +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* - -### Deprecations - -* The default value for `--package-format` and `conda_pkg_format` will become `.conda` in 25.1. (#5534) - -### Docs - -* - -### Other - -* diff --git a/news/5535-fix-variant-finding.rst b/news/5535-fix-variant-finding.rst deleted file mode 100644 index ea8a346e01..0000000000 --- a/news/5535-fix-variant-finding.rst +++ /dev/null @@ -1,21 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fixed a bug where variants were incorrectly found as being used when they matched a leading substring of - another variant. (#5535) -* Fixed a bug where variants were not found when variables were used in ``pin_*`` statements. (#5535) - -### Deprecations - -* - -### Docs - -* - -### Other - -* From 81d151889c17facb57daf15663753788952f4804 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Thu, 21 Nov 2024 16:42:37 -0600 Subject: [PATCH 3/4] Correct deprecation message when no arguments are passed (#5550) * Update main_build.py * Add news --- conda_build/cli/main_build.py | 2 +- news/5550-fix-TypeError-no-arguments | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 news/5550-fix-TypeError-no-arguments diff --git a/conda_build/cli/main_build.py b/conda_build/cli/main_build.py index 3d9e43a5fb..221299b485 100644 --- a/conda_build/cli/main_build.py +++ b/conda_build/cli/main_build.py @@ -512,7 +512,7 @@ def parse_args(args: Sequence[str] | None) -> tuple[ArgumentParser, Namespace]: # TODO: Remove in 25.1 if ( - all(not arg.startswith("--package-format") for arg in args) + all(not arg.startswith("--package-format") for arg in (args or [])) and warn_about_default_pkg_format and "purge" not in parsed.recipe and "purge-all" not in parsed.recipe diff --git a/news/5550-fix-TypeError-no-arguments b/news/5550-fix-TypeError-no-arguments new file mode 100644 index 0000000000..08f22156d9 --- /dev/null +++ b/news/5550-fix-TypeError-no-arguments @@ -0,0 +1,19 @@ +### Enhancements + +* + +### Bug fixes + +* Fix `TypeError` when no CLI arguments are passed. (#5549 via #5550) + +### Deprecations + +* + +### Docs + +* + +### Other + +* From 1d4235a8a8ced33c7b76ab31aff18a2fa0c7ec2b Mon Sep 17 00:00:00 2001 From: Bianca Henderson Date: Thu, 21 Nov 2024 21:35:54 -0500 Subject: [PATCH 4/4] Changelog 24.11.1 (#5552) * Update .authors.yml * Updated authorship for 24.11.1 * Updated CHANGELOG for 24.11.1 --- .authors.yml | 4 ++-- CHANGELOG.md | 13 +++++++++++++ news/5550-fix-TypeError-no-arguments | 19 ------------------- 3 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 news/5550-fix-TypeError-no-arguments diff --git a/.authors.yml b/.authors.yml index a7fd86b592..85de92f3a8 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1202,7 +1202,7 @@ alternate_emails: - clee@anaconda.com - name: Ken Odegard - num_commits: 227 + num_commits: 228 email: kodegard@anaconda.com first_commit: 2020-09-08 19:53:41 github: kenodegard @@ -1251,7 +1251,7 @@ github: beeankha alternate_emails: - beeankha@gmail.com - num_commits: 39 + num_commits: 40 first_commit: 2022-01-19 16:40:06 - name: Conda Bot email: 18747875+conda-bot@users.noreply.github.com diff --git a/CHANGELOG.md b/CHANGELOG.md index b73549f82c..7d9e0ab989 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ [//]: # (current developments) +## 24.11.1 (2024-11-21) + +### Bug fixes + +* Fix `TypeError` when no CLI arguments are passed. (#5549 via #5550) + +### Contributors + +* @beeankha +* @kenodegard + + + ## 24.11.0 (2024-11-15) ### Enhancements diff --git a/news/5550-fix-TypeError-no-arguments b/news/5550-fix-TypeError-no-arguments deleted file mode 100644 index 08f22156d9..0000000000 --- a/news/5550-fix-TypeError-no-arguments +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix `TypeError` when no CLI arguments are passed. (#5549 via #5550) - -### Deprecations - -* - -### Docs - -* - -### Other - -*