Skip to content

feat: allow skipping apptainer and conda tests if not available#3074

Merged
johanneskoester merged 1 commit intosnakemake:mainfrom
veprbl:pr/skipif_conda_apptainer
Sep 7, 2024
Merged

feat: allow skipping apptainer and conda tests if not available#3074
johanneskoester merged 1 commit intosnakemake:mainfrom
veprbl:pr/skipif_conda_apptainer

Conversation

@veprbl
Copy link
Copy Markdown
Contributor

@veprbl veprbl commented Sep 5, 2024

There is no point to attempt testing apptainer and/or conda if they are not in the environment. This also marks few tests with @connected.

Summary by CodeRabbit

  • New Features

    • Introduced conditional test execution based on the availability of Apptainer and Conda environments.
    • Added new pytest markers to enhance test suite flexibility.
  • Bug Fixes

    • Improved robustness of the testing framework by ensuring tests can be skipped if required tools are not present.
  • Documentation

    • Updated test functions to reflect their association with specific deployment methods for better clarity.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai bot commented Sep 5, 2024

Walkthrough

The changes introduce two functions, has_apptainer() and has_conda(), to check for the availability of Apptainer and Conda executables. New pytest markers, apptainer and conda, are defined to conditionally skip tests based on the presence of these tools. Various test functions in tests/tests.py are updated with these markers, allowing tests to be executed in specific environments managed by Conda and Apptainer.

Changes

Files Change Summary
tests/common.py Added functions has_apptainer() and has_conda() to check for Apptainer and Conda executables. Introduced new pytest markers apptainer and conda.
tests/tests.py Updated numerous test functions with @conda and @apptainer decorators to associate tests with specific deployment methods. Added @connected to some tests.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 2ec61f4 and 02d9726.

Files selected for processing (2)
  • tests/common.py (2 hunks)
  • tests/tests.py (33 hunks)
Additional context used
Path-based instructions (2)
tests/common.py (1)

Pattern **/*.py: Do not try to improve formatting.
Do not suggest type annotations for functions that are defined inside of functions or methods.
Do not suggest type annotation of the self argument of methods.
Do not suggest type annotation of the cls argument of classmethods.
Do not suggest return type annotation if a function or method does not contain a return statement.

tests/tests.py (1)

Pattern **/*.py: Do not try to improve formatting.
Do not suggest type annotations for functions that are defined inside of functions or methods.
Do not suggest type annotation of the self argument of methods.
Do not suggest type annotation of the cls argument of classmethods.
Do not suggest return type annotation if a function or method does not contain a return statement.

Additional comments not posted (4)
tests/common.py (4)

72-76: Function has_apptainer is correctly implemented.

The function uses shutil.which() to check for the presence of "apptainer" or "singularity" executables, which is a standard and effective method for this purpose.


79-80: Function has_conda is correctly implemented.

The function uses shutil.which() to check for the presence of the "conda" executable, which is a standard and effective method for this purpose.


101-105: Pytest marker apptainer is correctly defined.

The marker uses the has_apptainer() function to conditionally skip tests if Apptainer or Singularity is not available. The reason for skipping is clearly and appropriately stated.


107-111: Pytest marker conda is correctly defined.

The marker uses the has_conda() function to conditionally skip tests if Conda is not available. The reason for skipping is clearly and appropriately stated.

@veprbl veprbl force-pushed the pr/skipif_conda_apptainer branch from 02d9726 to a20ec26 Compare September 6, 2024 15:39
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Sep 6, 2024

Copy link
Copy Markdown
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 02d9726 and a20ec26.

Files selected for processing (2)
  • tests/common.py (2 hunks)
  • tests/tests.py (33 hunks)
Files skipped from review as they are similar to previous changes (2)
  • tests/common.py
  • tests/tests.py

@johanneskoester johanneskoester merged commit c3cd4e0 into snakemake:main Sep 7, 2024
johanneskoester pushed a commit that referenced this pull request Sep 7, 2024
🤖 I have created a release *beep* *boop*
---


##
[8.20.0](v8.19.3...v8.20.0)
(2024-09-07)


### Features

* allow skipping apptainer and conda tests if not available
([#3074](#3074))
([c3cd4e0](c3cd4e0))
* MANIFEST.in: include tests/ in sdist
([#3073](#3073))
([e24f3fc](e24f3fc))


### Bug Fixes

* add subfolders of report template to package data
([14a8f22](14a8f22))
* Inconsistent Linting Output Formatting
([#3064](#3064))
([90e51ae](90e51ae))
* retry when downloading assets
([58e41b0](58e41b0))
* skip asset download if files are already present
([#3076](#3076))
([0d3d1e1](0d3d1e1))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@coderabbitai coderabbitai bot mentioned this pull request Feb 17, 2025
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants