Skip to content

Commit

Permalink
Merge pull request NationalGenomicsInfrastructure#455 from kedhammar/…
Browse files Browse the repository at this point in the history
…free-prom-col3

Free column 3 of PromethION
  • Loading branch information
kedhammar authored Dec 11, 2024
2 parents df99157 + 11fd542 commit 9ce7390
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 25 deletions.
4 changes: 4 additions & 0 deletions VERSIONLOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# TACA Version Log

## 20241211.1

No longer reserve PromethION column 3 for Clinical Genomics.

## 20241210.4

Change server_status nas to update statusdb by default
Expand Down
5 changes: 2 additions & 3 deletions taca/nanopore/instrument_transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
from glob import glob

RUN_PATTERN = re.compile(
# Run folder name expected as yyyymmdd_HHMM_1A-3H/MN19414_flowCellId_randomHash
# Run folder name expected as yyyymmdd_HHMM_positionOrInstrument_flowCellId_randomHash
# Flow cell names starting with "CTC" are configuration test cells and should not be included
# As of december 2023, the third column (3A-3H) is excluded, because it will be used by Clinical Genomics
r"^\d{8}_\d{4}_(([1-2][A-H])|(MN19414))_(?!CTC)[A-Za-z0-9]+_[A-Za-z0-9]+$"
r"^\d{8}_\d{4}_(([1-3][A-H])|(MN19414))_(?!CTC)[A-Za-z0-9]+_[A-Za-z0-9]+$"
)


Expand Down
22 changes: 0 additions & 22 deletions tests/nanopore/test_instrument_transfer.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,28 +135,6 @@ def test_main_ignore_CTC(setup_test_fixture):
mock_dump_path.assert_not_called()


def test_main_ignore_col3(setup_test_fixture):
"""Check so that runs on column 3 (set aside for Clinical Genomics as of december 2023)
are not picked up.
"""

# Run fixture
args, tmp, file_paths = setup_test_fixture

# Setup run
run_path = (
f"{args.source_dir}/experiment/sample/{DUMMY_RUN_NAME.replace('MN19414', '3A')}"
)
os.makedirs(run_path)

with patch("taca.nanopore.instrument_transfer.dump_path") as mock_dump_path:
# Start testing
instrument_transfer.main(args)

# Check dump_path was not called
mock_dump_path.assert_not_called()


@pytest.mark.parametrize(
"finished, qc", [(True, True), (True, False), (False, True), (False, False)]
)
Expand Down

0 comments on commit 9ce7390

Please sign in to comment.