Skip to content

Conversation

jaimergp
Copy link
Contributor

@jaimergp jaimergp commented Mar 21, 2025

Description

Stopgap for #5644 and #5645

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

pre-commit-ci bot and others added 2 commits March 17, 2025 11:52
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>
Merge `25.3.x` back into `main`
@jaimergp jaimergp requested a review from a team as a code owner March 21, 2025 09:55
@github-project-automation github-project-automation bot moved this to 🆕 New in 🔎 Review Mar 21, 2025
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Mar 21, 2025
Copy link

codspeed-hq bot commented Mar 21, 2025

CodSpeed Performance Report

Merging #5647 will not alter performance

Comparing revert-5603-transitive-subpackage (4af808a) with 25.3.x (e77c4c6)

Summary

✅ 5 untouched benchmarks

@jaimergp jaimergp mentioned this pull request Mar 21, 2025
59 tasks
Copy link
Contributor

@beckermr beckermr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's leave the test and mark it as xfail.

@github-project-automation github-project-automation bot moved this from 🆕 New to 🏗️ In Progress in 🔎 Review Mar 21, 2025
@jaimergp jaimergp force-pushed the revert-5603-transitive-subpackage branch from f4e9170 to 66ccb2a Compare March 21, 2025 15:23
beckermr
beckermr previously approved these changes Mar 21, 2025
@github-project-automation github-project-automation bot moved this from 🏗️ In Progress to ✅ Approved in 🔎 Review Mar 21, 2025
kenodegard
kenodegard previously approved these changes Mar 21, 2025
@h-vetinari
Copy link
Contributor

Another test to xfail?

FAILED tests/test_api_build.py::test_recipe_builds[transitive_subpackage]

@kenodegard kenodegard dismissed stale reviews from beckermr and themself via 4af808a March 21, 2025 23:06
@beckermr
Copy link
Contributor

I've added regression tests for this issue in this PR: #5648

@beckermr beckermr merged commit 19251f4 into 25.3.x Mar 23, 2025
28 checks passed
@beckermr beckermr deleted the revert-5603-transitive-subpackage branch March 23, 2025 12:36
@github-project-automation github-project-automation bot moved this from ✅ Approved to 🏁 Done in 🔎 Review Mar 23, 2025
isuruf added a commit to isuruf/conda-build that referenced this pull request Mar 24, 2025
kenodegard added a commit that referenced this pull request Mar 24, 2025
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

6 participants