Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ Hotfixes on `main` are allowed in principle, but no formal hotfix workflow has b

## Changelog fragments

This project uses `scriv` to manage changelog fragments.

Fragments are stored in:
This project uses `scriv` to manage changelog fragments. `scriv` is installed with the project dependencies, and creating the fragment is as simple as `scrive create` from the top level and then edit that fragment. Fragments are stored in:

- `changelog.d/`

Expand Down Expand Up @@ -76,7 +74,7 @@ Use one of the following categories in changelog fragments:
| Fixed | Bug fixes |
| Removed | Removed functionality |
| Documentation | Important documentation changes |
| Maintenance | Internal maintenance or dependency updates |
| Maintenance | Internal maintenance or dependency updates, CI, tooling, ... |

## Changelog files

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
### Maintenance

- Creates ci profile for hypothesis enabled tests to account for increased system variability via extending deadlines. Implemented in [PR #480](https://github.com/llnl/maestrowf/pull/480).

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool]
[tool.poetry]
name = "maestrowf"
version = "1.2.1dev3"
version = "1.2.1dev4"
description = "A tool to easily orchestrate general computational workflows both locally and on supercomputers."
license = "MIT License"
classifiers = [
Expand Down
19 changes: 18 additions & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,23 @@

from packaging.version import InvalidVersion

# Hypothesis profiles
from hypothesis import settings

# Profile for local development using default deadlines
settings.register_profile("local", deadline=200, max_examples=100)

# Profile for CI with relaxed deadlines to handle system variability
settings.register_profile("ci", deadline=1000, max_examples=100)

# Auto-detect and load correct profile
if os.getenv("CI") == "true":
settings.load_profile("ci")
else:
settings.load_profile("local")


# Check for active schedulers to enable/disable appropriate tests
SCHEDULERS = set(('sched_lsf', 'sched_slurm', 'sched_flux', 'sched_local'))
SCHED_CHECKS = defaultdict(lambda: False)

Expand All @@ -42,7 +59,7 @@ def check_lsf():

def check_slurm():
"""
Checks if there is a slurm instance to schedule to. NOT IMPLEMENTED YET.
Checks if there is a slurm instance to schedule to.
"""
slurm_info_func = 'sinfo'
try:
Expand Down
Loading