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

explicitly detect conda envs - fixes #12652 #12656

Merged

Conversation

RonnyPfannschmidt
Copy link
Member

@RonnyPfannschmidt RonnyPfannschmidt commented Jul 23, 2024

initially we accidentially detected conda environmnts by just testing too many files
after steamlining we no longer detected conda environments
now we explicitly detect conda environments and test for support

@jezdez - i believe this should solve it more future-proof, thanks for the input

Closes #12652

@psf-chronographer psf-chronographer bot added the bot:chronographer:provided (automation) changelog entry is part of PR label Jul 23, 2024
@RonnyPfannschmidt RonnyPfannschmidt added the backport 8.3.x apply to PRs at any point; backports the changes to the 8.3.x branch label Jul 23, 2024
initially we accidentially detected conda environmnts by just testing too many files
after steamlining we no longer detected conda environments
now we explicitly detect conda environments and test for support
Copy link
Member

@nicoddemus nicoddemus left a comment

Choose a reason for hiding this comment

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

Awesome, thanks @RonnyPfannschmidt for the quick fix!

Left some very minor suggestions.

changelog/12652.bugfix.rst Outdated Show resolved Hide resolved
src/_pytest/main.py Outdated Show resolved Hide resolved
Co-authored-by: Bruno Oliveira <nicoddemus@gmail.com>
@RonnyPfannschmidt RonnyPfannschmidt merged commit 6c806b4 into pytest-dev:main Jul 24, 2024
29 checks passed
Copy link

patchback bot commented Jul 24, 2024

Backport to 8.3.x: 💚 backport PR created

✅ Backport PR branch: patchback/backports/8.3.x/6c806b499ddbb844753b5c8c4d70a8b98b9d1c3a/pr-12656

Backported as #12657

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback bot pushed a commit that referenced this pull request Jul 24, 2024
RonnyPfannschmidt added a commit that referenced this pull request Jul 24, 2024
…c806b499ddbb844753b5c8c4d70a8b98b9d1c3a/pr-12656

[PR #12656/6c806b49 backport][8.3.x] explicitly detect conda envs - fixes #12652
@jezdez
Copy link

jezdez commented Jul 24, 2024

Thanks for the quick turnaround @nicoddemus @RonnyPfannschmidt!

@RonnyPfannschmidt
Copy link
Member Author

@nicoddemus I didn't yet get around to release

Unless something comes up I'd like to run the release after dinner

@RonnyPfannschmidt RonnyPfannschmidt deleted the fix-12652-detect-conda-env branch July 25, 2024 10:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 8.3.x apply to PRs at any point; backports the changes to the 8.3.x branch bot:chronographer:provided (automation) changelog entry is part of PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pytest==8.3.1 collects tests from Python dependencies within conda environments (regression from 8.2.2)
3 participants