Skip to content

Conversation

@henryiii
Copy link
Collaborator

@henryiii henryiii commented May 7, 2025

Adding a conda marker.

@henryiii henryiii force-pushed the henryiii/tests/condaup branch from 1241ce6 to 5498fdd Compare May 7, 2025 19:00
Signed-off-by: Henry Schreiner <[email protected]>
@henryiii henryiii force-pushed the henryiii/tests/condaup branch from 5498fdd to 0ba755d Compare October 8, 2025 17:50
@henryiii henryiii requested a review from Copilot October 13, 2025 21:00
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR consolidates conda test configuration by centralizing conda marker handling in the test infrastructure. Instead of using scattered conditional skip decorators, it implements a unified pytest marker system that automatically manages conda test execution.

  • Removed local HAS_CONDA variables and has_conda skip decorators from individual test files
  • Added centralized conda marker configuration in conftest.py with automatic test discovery and skipping
  • Replaced @has_conda decorators with @pytest.mark.conda markers across test files

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File Description
tests/test_virtualenv.py Removed local conda detection and replaced @has_conda decorators with @pytest.mark.conda markers
tests/test_sessions.py Removed local conda detection and replaced @has_conda decorator reference with pytest.mark.conda marker
tests/conftest.py Added centralized conda marker infrastructure with automatic test discovery and conda command blocking
pyproject.toml Added conda marker definition to pytest configuration

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@theacodes
Copy link
Collaborator

Looks fine, but what does the conda marker accomplish?

@henryiii
Copy link
Collaborator Author

henryiii commented Oct 13, 2025

This is an easier way to identify and potentially act on the conda tests. Most importantly, it means you can now skip the conda tests even if you have conda installed (pytest -m "not conda"). I believe (it's been a while!) that it came up because I was working on #965, and wanted a way to run only the conda tests (which can't be run in parallel, due to conda) (pytest -m conda), and then all the non-conda tests.

We can also now ensure that tests that call conda are marked (and therefore skipped), even if conda is installed on the developers machine.

@henryiii henryiii merged commit 53bf191 into wntrblm:main Oct 13, 2025
21 checks passed
@henryiii henryiii deleted the henryiii/tests/condaup branch October 13, 2025 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants