Skip to content

Commit 137ffc4

Browse files
authored
Merge pull request #1180 from nextstrain/snakemake-v9
Snakemake v9 support
2 parents 41cf647 + 3760ce5 commit 137ffc4

File tree

18 files changed

+171
-286
lines changed

18 files changed

+171
-286
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ auspice/
88
data/*
99
defaults/colors.tsv
1010
defaults/colors_*.tsv
11+
# stats.json was removed in Snakemake v8
1112
stats.json
1213

1314
# common analysis directory names

Snakefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ from os import environ
77
from socket import getfqdn
88
from getpass import getuser
99
from snakemake.logging import logger
10-
from snakemake.utils import validate
10+
from snakemake.utils import min_version, validate
1111
from collections import OrderedDict
1212
import textwrap
1313
import time
1414

1515

16+
# Minimum Snakemake version needed for the storage plugins used in remote_files.smk
17+
min_version("8.0.0")
18+
1619
# Store the user's configuration prior to loading defaults, so we can check for
1720
# reused subsampling scheme names in the user's config. We need to make a deep
1821
# copy because Snakemake will deep merge the subsampling dictionary later,

docs/src/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ def prose_list(items):
126126
# they block the client, probably anti-scraping measure
127127
r'^https://czgenepi\.org/resources',
128128
r'^https://science\.sciencemag\.org/content/early/2020/06/05/science\.abb9263',
129+
r'^https://www\.medrxiv\.org',
129130
# this link is correct but the lack of a top-level dataset means
130131
# it 404s initially — because the point of this link is showing
131132
# the community page, allow it to fail here:

docs/src/reference/change_log.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ We also use this change log to document new features that maintain backward comp
55

66
## New features since last version update
77

8+
## v17 (17 July 2025)
9+
10+
- 17 July 2025: Snakemake version 8 (or above) is now required. Various aspects of the workflow were incompatible with v8 including our support for remote files and have now been updated. The nextstrain runtimes have been correspondingly updated; see [the nextstrain-cli docs for how to upgrade these](https://docs.nextstrain.org/projects/cli/en/stable/commands/update/). [PR 1180](https://github.com/nextstrain/ncov/pull/1180)
11+
12+
- 17 July 2025: Support for Google Cloud Storage via `path_or_url` has been removed. Please get in touch if this is needed as it should be possible to restore it. Implemented in [PR 1180](https://github.com/nextstrain/ncov/pull/1180) and discussed [in this zika PR](https://github.com/nextstrain/zika/pull/89#discussion_r2190671313).
13+
14+
- 17 July 2025: Cluster support (both rhino and scicore) has been removed. [PR 1180](https://github.com/nextstrain/ncov/pull/1180)
15+
816
- 10 February 2025: Improve documentation regarding custom color map files.
917

1018
## v16 (29 January 2025)

nextstrain_profiles/nextstrain-gisaid-21L/config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ keep-going: False
77
printshellcmds: True
88
show-failed-logs: True
99
restart-times: 2
10-
reason: True
11-
stats: stats.json
1210
set-threads: tree=4

nextstrain_profiles/nextstrain-gisaid/config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ keep-going: False
77
printshellcmds: True
88
show-failed-logs: True
99
restart-times: 2
10-
reason: True
11-
stats: stats.json
1210
set-threads: tree=4

nextstrain_profiles/nextstrain-open/config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,4 @@ keep-going: False
77
printshellcmds: True
88
show-failed-logs: True
99
restart-times: 2
10-
reason: True
11-
stats: stats.json
1210
set-threads: tree=4

nextstrain_profiles/nextstrain-rhino/cluster.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

nextstrain_profiles/nextstrain-rhino/config.yaml

Lines changed: 0 additions & 63 deletions
This file was deleted.

nextstrain_profiles/nextstrain-scicore/cluster.json

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)