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.11.x back into main #5548

Merged
merged 4 commits into from
Nov 25, 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
24 changes: 12 additions & 12 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
email: [email protected]
aliases:
- Jonathan Helmus
num_commits: 110
num_commits: 111
first_commit: 2014-06-09 17:25:05
github: jjhelmus
- name: Isuru Fernando
Expand Down Expand Up @@ -370,7 +370,7 @@
github: ClinicalGraphics
- name: John Blischak
email: [email protected]
num_commits: 11
num_commits: 12
first_commit: 2017-08-11 13:23:55
github: jdblischak
- name: Floris Bruynooghe
Expand Down Expand Up @@ -1121,7 +1121,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 22
num_commits: 27
first_commit: 2019-10-17 23:05:16
github: beckermr
- name: Jinzhe Zeng
Expand Down Expand Up @@ -1202,7 +1202,7 @@
alternate_emails:
- [email protected]
- name: Ken Odegard
num_commits: 220
num_commits: 228
email: [email protected]
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand All @@ -1225,7 +1225,7 @@
first_commit: 2020-11-19 10:46:41
- name: Jannis Leidel
email: [email protected]
num_commits: 32
num_commits: 34
github: jezdez
first_commit: 2020-11-19 10:46:41
- name: Christof Kaufmann
Expand All @@ -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: [email protected]
Expand All @@ -1251,7 +1251,7 @@
github: beeankha
alternate_emails:
- [email protected]
num_commits: 43
num_commits: 40
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: [email protected]
Expand All @@ -1262,7 +1262,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 62
num_commits: 66
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: [email protected]
Expand Down Expand Up @@ -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: [email protected]
Expand All @@ -1327,7 +1327,7 @@
- name: Jaime Rodríguez-Guerra
email: [email protected]
github: jaimergp
num_commits: 17
num_commits: 20
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: [email protected]
Expand Down Expand Up @@ -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: [email protected]
Expand Down Expand Up @@ -1461,7 +1461,7 @@
github: timkpaine
- name: Klaus Zimmermann
email: [email protected]
num_commits: 2
num_commits: 3
first_commit: 2024-06-07 10:02:14
github: zklaus
- name: Daniel Ching
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
62 changes: 62 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,67 @@
[//]: # (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

* 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
Expand Down
2 changes: 1 addition & 1 deletion conda_build/cli/main_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 0 additions & 22 deletions news/4890-package-format-cli-options

This file was deleted.

19 changes: 0 additions & 19 deletions news/5479-better-document-run_test.r

This file was deleted.

19 changes: 0 additions & 19 deletions news/5497-deprecate-UnableToParseMissingJinja2

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions news/5508-deprecate-get_build_index-locking-timeout

This file was deleted.

19 changes: 0 additions & 19 deletions news/5514-better-jinja2-regex.rst

This file was deleted.

19 changes: 0 additions & 19 deletions news/5517-fix-skeleton-patch.rst

This file was deleted.

19 changes: 0 additions & 19 deletions news/5518-fix-docs-build.rst

This file was deleted.

19 changes: 0 additions & 19 deletions news/5525-py38

This file was deleted.

19 changes: 0 additions & 19 deletions news/5528-jinja2-first-pass.rst

This file was deleted.

Loading
Loading