diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 4fb81c9..01df5b0 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -16,6 +16,7 @@ jobs: with: release-type: python package-name: snakemake-interface-scheduler-plugins + token: ${{ secrets.RELEASE_PLEASE_PR_CI_TOKEN }} publish: runs-on: ubuntu-latest @@ -35,4 +36,4 @@ jobs: uses: pypa/gh-action-pypi-publish@release/v1 with: user: __token__ - password: ${{ secrets.PYPI_TOKEN }} \ No newline at end of file + password: ${{ secrets.PYPI_TOKEN }} diff --git a/src/snakemake_interface_scheduler_plugins/tests.py b/src/snakemake_interface_scheduler_plugins/tests.py index c84dd3e..86606a5 100644 --- a/src/snakemake_interface_scheduler_plugins/tests.py +++ b/src/snakemake_interface_scheduler_plugins/tests.py @@ -72,12 +72,18 @@ def __init__(self) -> None: output=[AnnotatedString("output3.txt")], resources={"cpu": 1, "mem_mb": 1024}, ), + DummyJob( + input=[AnnotatedString("output1.txt")], + output=[AnnotatedString("output4.txt")], + resources={"cpu": 1, "mem_mb": 10024}, + ), ] self._dependencies: Mapping[ SingleJobSchedulerInterface, List[SingleJobSchedulerInterface] ] = { self._jobs[1]: [self._jobs[0]], self._jobs[2]: [self._jobs[0]], + self._jobs[3]: [self._jobs[0]], } self._finished = set() @@ -143,11 +149,11 @@ def test_scheduler(self): dag._finished.add(dag._jobs[0]) scheduled = scheduler.select_jobs( - [dag._jobs[1], dag._jobs[2]], + [dag._jobs[1], dag._jobs[2], dag._jobs[3]], dag._jobs, available_resources={"cpu": 5, "mem_mb": 10000}, input_sizes=defaultdict(int), ) - assert scheduled == [dag._jobs[1], dag._jobs[2]], ( + assert set(scheduled) == set([dag._jobs[1], dag._jobs[2]]), ( "Scheduler did not select the expected jobs" )