Skip to content

Merge 25.3.x back into main#5658

Merged
kenodegard merged 5 commits intomainfrom
25.3.x-connector
Mar 28, 2025
Merged

Merge 25.3.x back into main#5658
kenodegard merged 5 commits intomainfrom
25.3.x-connector

Conversation

@kenodegard
Copy link
Copy Markdown
Contributor

Xref #5632

Warning

DO NOT SQUASH MERGE!

jaimergp and others added 5 commits March 23, 2025 07:36
* [pre-commit.ci] pre-commit autoupdate (#5641)

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.9.10 → v0.11.0](astral-sh/ruff-pre-commit@v0.9.10...v0.11.0)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Revert "Fix transitive subpackage dependency resolution (#5603)"

This reverts commit 49872a5, but keeping tests

* add news

* xfail test

* pre-commit

* test: add test for grpc regression

* fix: need to limit to linux

* fix: specify conda-forge

* test: add 5644 test

* test: try osx-arm64 recipe

* test: ensure cross-compiles

* fix: skip message is wrong

* Xfail recipe

* style: pre-the-commit

* doc: add news

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
Co-authored-by: jaimergp <jaimergp@users.noreply.github.com>
* Downgrade necessary permissions for build script

* Use atomic moves to minimize attack window

* add news

* minimize windows further

* use opener

* Provide new helper context manager to handle atomic writes and permission setting

* pre-commit

* clarify need for umask reset

* use secrets.token_urlsafe with 64 characters

* Revert "Fix transitive subpackage dependency resolution (#5603)" (#5647)

* Update conda_build/utils.py

Co-authored-by: Ken Odegard <kodegard@anaconda.com>

* Update conda_build/utils.py

---------

Co-authored-by: jaimergp <jaimergp@users.noreply.github.com>
Co-authored-by: Matthew R. Becker <beckermr@users.noreply.github.com>
@kenodegard kenodegard requested a review from a team as a code owner March 28, 2025 18:24
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Mar 28, 2025
@github-project-automation github-project-automation bot moved this to 🆕 New in 🔎 Review Mar 28, 2025
@kenodegard kenodegard moved this from 🆕 New to 👀 In Review in 🔎 Review Mar 28, 2025
@kenodegard kenodegard mentioned this pull request Mar 28, 2025
59 tasks
@codspeed-hq
Copy link
Copy Markdown

codspeed-hq bot commented Mar 28, 2025

CodSpeed Performance Report

Merging #5658 will not alter performance

Comparing 25.3.x-connector (8429563) with main (639ba11)

Summary

✅ 5 untouched benchmarks

@github-project-automation github-project-automation bot moved this from 👀 In Review to ✅ Approved in 🔎 Review Mar 28, 2025
@kenodegard kenodegard merged commit cca79d1 into main Mar 28, 2025
30 checks passed
@kenodegard kenodegard deleted the 25.3.x-connector branch March 28, 2025 21:35
@github-project-automation github-project-automation bot moved this from ✅ Approved to 🏁 Done in 🔎 Review Mar 28, 2025
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Mar 29, 2026
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 29, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

4 participants