Skip to content

Commit 8e33e22

Browse files
authored
Merge pull request #1137 from nextstrain/fix-broken-links-1133
Fix broken links [#1133]
2 parents 0769ac0 + 5810e0f commit 8e33e22

13 files changed

+59
-22
lines changed

docs/src/conf.py

+32
Original file line numberDiff line numberDiff line change
@@ -113,3 +113,35 @@ def prose_list(items):
113113
'auspice': ('https://docs.nextstrain.org/projects/auspice/en/stable', None),
114114
'snakemake': ('https://snakemake.readthedocs.io/en/stable', None),
115115
}
116+
117+
# -- Linkchecking ------------------------------------------------------------
118+
119+
linkcheck_ignore = [
120+
# we have links to localhost for explanatory purposes; obviously
121+
# they will never work in the linkchecker
122+
r'^http://127\.0\.0\.1:\d+',
123+
r'^http://localhost:\d+',
124+
# the top level bucket link 404s
125+
r'^https://data\.nextstrain\.org$',
126+
# they block the client, probably anti-scraping measure
127+
r'^https://czgenepi\.org/resources',
128+
r'^https://science\.sciencemag\.org/content/early/2020/06/05/science\.abb9263',
129+
# this link is correct but the lack of a top-level dataset means
130+
# it 404s initially — because the point of this link is showing
131+
# the community page, allow it to fail here:
132+
r'^https://nextstrain\.org/community/ESR-NZ/GenomicsNarrativeSARSCoV2$'
133+
]
134+
linkcheck_anchors_ignore_for_url = [
135+
# Github uses anchor-looking links for highlighting lines but
136+
# handles the actual resolution with Javascript, so skip anchor
137+
# checks for Github URLs:
138+
r'^https://github\.com',
139+
# you need to be logged in to see the anchor (and it looks like
140+
# Terra is using it for redirecting more than anchoring too…)
141+
r'^https://app\.terra\.bio/',
142+
# client is blocked but links work
143+
r'^https://www\.science\.org/doi/10\.1126/science\.abb9263',
144+
# linkchecker doesn't support text fragments, and we link to one
145+
# anchored to this page
146+
r'^https://en\.wikipedia\.org/wiki/Consensus_sequence',
147+
]

docs/src/guides/data-prep/gisaid-search.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ The following instructions describe how to curate data for a region-specific ana
99
Login to GISAID
1010
---------------
1111

12-
Navigate to `GISAID (gisaid.org) <https://www.gisaid.org/>`__ and select the “Login” link.
12+
Navigate to `GISAID (gisaid.org) <https://gisaid.org/>`__ and select the “Login” link.
1313

1414
.. figure:: ../../images/gisaid-homepage.png
1515
:alt: GISAID homepage with login link

docs/src/guides/update-workflow.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ We update the official workflow regularly with:
55

66
- `curated metadata including latitudes/longitudes, clade annotations, and low quality sequences <https://github.com/nextstrain/ncov/commits/master>`__
77
- bug fixes
8-
- `new features <../reference/change_log>`__
8+
- :doc:`new features <../reference/change_log>`
99

1010
Update your local copy of the workflow, to benefit from these changes.
1111

@@ -21,7 +21,7 @@ Update your local copy of the workflow, to benefit from these changes.
2121
# and then replay your local changes on top of those incoming changes.
2222
git pull --rebase origin master
2323
24-
Alternately, download a specific version of the workflow that you know works for you. We create new `releases of the workflow <https://github.com/nextstrain/ncov/releases/>`__ any time we introduce breaking changes, so you can choose when to update based on `what has changed <../reference/change_log>`__.
24+
Alternately, download a specific version of the workflow that you know works for you. We create new `releases of the workflow <https://github.com/nextstrain/ncov/releases/>`__ any time we introduce breaking changes, so you can choose when to update based on :doc:`what has changed <../reference/change_log>`.
2525

2626
.. code:: bash
2727

docs/src/reference/change_log.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ We also use this change log to document new features that maintain backward comp
107107

108108
## New features since last version update
109109

110-
- 11 August 2021: Add support for "Sequences" and "Patient status metadata" downloads from GISAID's search interface including [documentation in the tutorial of how to use these data](../guides/data-prep.html#curate-data-from-gisaid-search-and-downloads). ([#701](https://github.com/nextstrain/ncov/pull/701))
110+
- 11 August 2021: Add support for "Sequences" and "Patient status metadata" downloads from GISAID's search interface including [documentation in the tutorial of how to use these data](https://docs.nextstrain.org/projects/ncov/en/latest/guides/data-prep/gisaid-search.html). ([#701](https://github.com/nextstrain/ncov/pull/701))
111111
- 6 August 2021: We've replaced the mechanisms that support remote file inputs (e.g. `s3://` URLs) to improve internal workflow structure, extend support to `gs://`, `http://`, and `https://` URLs, and expand support for compressed inputs.
112112
Our [remote file inputs documentation](remote_inputs) is updated to reflect the changes.
113113

@@ -128,7 +128,7 @@ We also use this change log to document new features that maintain backward comp
128128

129129
## v7 (27 May 2021)
130130

131-
For more details about this release, see [the configuration reference for the new "sanitize metadata" parameters](configuration.html#sanitize_metadata) and [the corresponding pull request](https://github.com/nextstrain/ncov/pull/640).
131+
For more details about this release, see [the configuration reference for the new "sanitize metadata" parameters](https://docs.nextstrain.org/projects/ncov/en/latest/reference/workflow-config-file.html#sanitize-metadata) and [the corresponding pull request](https://github.com/nextstrain/ncov/pull/640).
132132

133133
### Major changes
134134

@@ -141,7 +141,7 @@ For more details about this release, see [the configuration reference for the ne
141141

142142
## New features since last version update
143143

144-
- 25 May 2021: Support custom Auspice JSON prefixes with a new configuration parameter, `auspice_json_prefix`. [See the configuration reference for more details](configuration.html#auspice_json_prefix). ([#643](https://github.com/nextstrain/ncov/pull/643))
144+
- 25 May 2021: Support custom Auspice JSON prefixes with a new configuration parameter, `auspice_json_prefix`. [See the configuration reference for more details](https://docs.nextstrain.org/projects/ncov/en/latest/reference/workflow-config-file.html#auspice-json-prefix). ([#643](https://github.com/nextstrain/ncov/pull/643))
145145

146146
## v6 (20 May 2021)
147147

@@ -161,7 +161,7 @@ For more details about this release, see [the configuration reference for the ne
161161

162162
### Major changes
163163

164-
- Drop support for old sequence/metadata inputs. This change removes support for the `config["sequences"]` and `config["metadata"]` starting points for the workflow in favor of the more flexible [`config["inputs"]` format](configuration.html#inputs).
164+
- Drop support for old sequence/metadata inputs. This change removes support for the `config["sequences"]` and `config["metadata"]` starting points for the workflow in favor of the more flexible [`config["inputs"]` format](https://docs.nextstrain.org/projects/ncov/en/latest/reference/workflow-config-file.html#inputs).
165165
- Use `nextalign` for alignment instead of `mafft`. This change completely removes support for `mafft` in favor of `nextalign`. Future versions may reinstate `mafft` support as part of `augur align` updates.
166166

167167
### Minor changes
@@ -188,7 +188,7 @@ For more details about this release, see [the configuration reference for the ne
188188

189189
## New features since last version update
190190

191-
- 20 April 2021: Surface emerging lineage as a colorby. This replaces the rather stale color by "Emerging Clade" with a new color by "Emerging Lineage". This focuses on PANGO lineages that are of interest triangulated by [CoVariants](https://covariants.org/), [PANGO](https://cov-lineages.org/) international lineage reports, [CDC](https://www.cdc.gov/coronavirus/2019-ncov/cases-updates/variant-surveillance/variant-info.html) VUIs and VOCs and [PHE](https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/975742/Variants_of_Concern_VOC_Technical_Briefing_8_England.pdf) VUIs and VOCs. The intention is for the listing at `emerging_lineages.tsv` to be updated frequently with new lineages added and no longer interesting lineages dropped. [#609](https://github.com/nextstrain/ncov/pull/609)
191+
- 20 April 2021: Surface emerging lineage as a colorby. This replaces the rather stale color by "Emerging Clade" with a new color by "Emerging Lineage". This focuses on PANGO lineages that are of interest triangulated by [CoVariants](https://covariants.org/), [PANGO](https://cov-lineages.org/) international lineage reports, [CDC](https://www.cdc.gov/covid/php/variants/index.html) VUIs and VOCs and [PHE](https://assets.publishing.service.gov.uk/government/uploads/system/uploads/attachment_data/file/975742/Variants_of_Concern_VOC_Technical_Briefing_8_England.pdf) VUIs and VOCs. The intention is for the listing at `emerging_lineages.tsv` to be updated frequently with new lineages added and no longer interesting lineages dropped. [#609](https://github.com/nextstrain/ncov/pull/609)
192192

193193
- 12 April 2021: Calculate current clade frequency and logistic growth rate across nodes in the phylogeny. This produces a new `logistic_growth.json` file and uses this file to add a coloring the final Auspice JSON. Implementation choices are discussed in PR [#595](https://github.com/nextstrain/ncov/pull/595).
194194

docs/src/reference/metadata-fields.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Name of the pathogen.
2121
Column 3: ``gisaid_epi_isl``
2222
--------------------------------------
2323

24-
If this genome is shared via `GISAID <https://www.gisaid.org/>`__ then please include the EPI ISL here. In our example this is ``EPI_ISL_413490``.
24+
If this genome is shared via `GISAID <https://gisaid.org/>`__ then please include the EPI ISL here. In our example this is ``EPI_ISL_413490``.
2525

2626
Column 4: ``genbank_accession``
2727
--------------------------------------
@@ -112,12 +112,12 @@ Sex of the patient from whom the sample was collected. This will show up in ausp
112112
Column 18: ``originating_lab``
113113
--------------------------------------
114114

115-
Please see `GISAID <https://www.gisaid.org/help/publish-with-gisaid-references/>`__ for more information.
115+
Please see `GISAID <https://gisaid.org/publish/>`__ for more information.
116116

117117
Column 19: ``submitting_lab``
118118
--------------------------------------
119119

120-
Please see `GISAID <https://www.gisaid.org/help/publish-with-gisaid-references/>`__ for more information.
120+
Please see `GISAID <https://gisaid.org/publish/>`__ for more information.
121121

122122
Column 20: ``authors``
123123
--------------------------------------
@@ -127,7 +127,7 @@ Author of the genome sequence, or the paper which announced this genome. Typical
127127
Column 21: ``url``
128128
--------------------------------------
129129

130-
The URL, if available, pointing to the genome data. For most SARS-CoV-2 data this is https://www.gisaid.org.
130+
The URL, if available, pointing to the genome data. For most SARS-CoV-2 data this is https://gisaid.org.
131131

132132
Column 22: ``title``
133133
--------------------------------------

docs/src/reference/remote_inputs.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Entire metadata & sequences data is uploaded from the ``ncov-ingest`` workflows
2727
- ``metadata.tsv.zst`` and ``metadata.tsv.gz``
2828
- ``sequences.fasta.zst`` and ``sequences.fasta.xz``
2929
- ``nextclade.tsv.zst`` and ``nextclade.tsv.gz``
30-
- ``aligned.fasta.zst`` and ``aligned.fasta.xz`` (Alignment via `Nextclade <https://docs.nextstrain.org/projects/nextclade/en/stable/user/output-files.html#aligned-nucleotide-sequences>`__. The default reference genome is `MN908947 <https://www.ncbi.nlm.nih.gov/nuccore/MN908947>`__ (Wuhan-Hu-1))
30+
- ``aligned.fasta.zst`` and ``aligned.fasta.xz`` (Alignment via `Nextclade <https://docs.nextstrain.org/projects/nextclade/en/stable/user/output-files/02-nuc-alignment.html>`__. The default reference genome is `MN908947 <https://www.ncbi.nlm.nih.gov/nuccore/MN908947>`__ (Wuhan-Hu-1))
3131
- ``additional_info.tsv.zst`` and ``additional_info.tsv.gz`` (GISAID only)
3232
- ``flagged_metadata.txt.zst`` and ``flagged_metadata.txt.gz`` (GISAID only)
3333

docs/src/reference/workflow-config-file.rst

+6-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ Primary configuration
1515
Parameters in this section define the main inputs and outputs of the workflow, as well as the commonly used ``subsampling`` rule.
1616
Often these will be the only parameters you need to modify.
1717

18+
.. _inputs:
19+
1820
inputs
1921
------
2022

@@ -198,7 +200,7 @@ subsampling
198200
-----------
199201

200202
- type: object
201-
- description: Schemes for subsampling data prior to phylogenetic inference to avoid sampling bias or focus an analysis on specific spatial and/or temporal scales. `See the SARS-CoV-2 tutorial for more details on defining subsampling schemes <../reference/customizing-analysis.html#subsampling>`__.
203+
- description: Schemes for subsampling data prior to phylogenetic inference to avoid sampling bias or focus an analysis on specific spatial and/or temporal scales. See the :doc:`genomic surveillance tutorial <../tutorial/genomic-surveillance>` for an example.
202204

203205
Predefined subsampling schemes are:
204206

@@ -400,6 +402,7 @@ strip_strain_prefixes
400402
- description: A list of prefixes to strip from strain names in metadata and sequence records to maintain consistent strain names when analyzing data from multiple sources.
401403
- default: ``["hCoV-19/", "SARS-CoV-2/"]``
402404

405+
.. _auspice_json_prefix:
403406

404407
auspice_json_prefix
405408
-------------------
@@ -595,6 +598,8 @@ Per-Rule configuration
595598
Each top-level parameter here corresponds to a single Snakemake rule.
596599
Note that ``subsampling`` is a commonly used rule configuration which is described separately in the Primary configuration section.
597600

601+
.. _sanitize_metadata:
602+
598603
sanitize_metadata
599604
-----------------
600605

docs/src/tutorial/custom-data.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Prerequisites
1212
-------------
1313

1414
1. :doc:`example-data`. This tutorial sets up the command line environment used in the following tutorial.
15-
2. `Register for a GISAID account <https://www.gisaid.org/registration/register/>`_, if you do not have one yet. However, registration may take a few days. Follow :doc:`alternative data preparation methods <../guides/data-prep/index>` in place of :ref:`custom-data-curate-data-from-gisaid`, if you wish to continue the following tutorial in the meantime.
15+
2. `Register for a GISAID account <https://gisaid.org/register//>`_, if you do not have one yet. However, registration may take a few days. Follow :doc:`alternative data preparation methods <../guides/data-prep/index>` in place of :ref:`custom-data-curate-data-from-gisaid`, if you wish to continue the following tutorial in the meantime.
1616

1717
Setup
1818
-----
@@ -30,7 +30,7 @@ Curate data from GISAID
3030

3131
We will retrieve 10 sequences from GISAID's EpiCoV database.
3232

33-
1. Navigate to `GISAID <https://www.gisaid.org/>`__ and select **Login**.
33+
1. Navigate to `GISAID <https://gisaid.org/>`__ and select **Login**.
3434

3535
.. image:: ../images/gisaid-homepage.png
3636
:width: 400

docs/src/tutorial/genomic-surveillance.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Prerequisites
1515
-------------
1616

1717
1. :doc:`custom-data`. This tutorial introduces concepts expanded by the following tutorial.
18-
2. `Register for a GISAID account <https://www.gisaid.org/registration/register/>`_, if you do not have one yet. However, registration may take a few days. Follow :doc:`alternative data preparation methods <../guides/data-prep/index>` in place of :ref:`genomic-surveillance-curate-data-from-gisaid`, if you wish to continue the following tutorial in the meantime.
18+
2. `Register for a GISAID account <https://gisaid.org/registration/>`_, if you do not have one yet. However, registration may take a few days. Follow :doc:`alternative data preparation methods <../guides/data-prep/index>` in place of :ref:`genomic-surveillance-curate-data-from-gisaid`, if you wish to continue the following tutorial in the meantime.
1919

2020
Setup
2121
-----
@@ -33,7 +33,7 @@ Curate data from GISAID
3333

3434
We will download a focal set of Idaho sequences from GISAID's EpiCoV database.
3535

36-
1. Navigate to `GISAID <https://www.gisaid.org/>`__, **Login**, and go to **EpiCoV** > **Search**.
36+
1. Navigate to `GISAID <https://gisaid.org/>`__, **Login**, and go to **EpiCoV** > **Search**.
3737

3838
.. image:: ../images/gisaid-epicov-search.png
3939
:width: 400

docs/src/tutorial/next-steps.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ Additional resources
7373

7474
- `An applied genomic epidemiological handbook <https://alliblk.github.io/genepi-book/intro.html>`__ by Allison Black and Gytis Dudas
7575
- `Genomic Epidemiology Seminar Series <https://czgenepi.org/resources>`__ by Chan Zuckerberg Initiative Genomic Epidemiology (CZ GEN EPI)
76-
- `COVID-19 Genomic Epidemiology Toolkit <https://www.cdc.gov/amd/training/covid-19-gen-epi-toolkit.html>`__ by Centers for Disease Control and Prevention (CDC)
76+
- `COVID-19 Genomic Epidemiology Toolkit <https://www.cdc.gov/advanced-molecular-detection/php/training/?CDC_AAref_Val=https://www.cdc.gov/amd/training/covid-19-gen-epi-toolkit.html>`__ by Centers for Disease Control and Prevention (CDC)
7777

7878
- :doc:`Review all possible options to configure your SARS-CoV-2 analyses with Nextstrain <../reference/workflow-config-file>`.
7979
- Watch `this 1-hour video overview <https://youtu.be/m4_F2tG58Pc>`__ by Heather Blankenship on how to deploy Nextstrain for a Public Health lab.

docs/src/tutorial/setup.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Register for a GISAID account
1010
-----------------------------
1111

1212
Some tutorials rely on data downloaded from `GISAID <https://gisaid.org/>`_.
13-
If you do not already have one, `register for a GISAID account <https://www.gisaid.org/registration/register/>`_ now.
13+
If you do not already have one, `register for a GISAID account <https://gisaid.org/registration/>`_ now.
1414
Registration may take a few days.
1515

1616
Install Nextstrain components

docs/src/visualization/interpretation.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Introductory resources
1010

1111
- How to interact with Auspice (the engine for viewing trees): https://neherlab.org/201901_krisp_auspice.html
1212

13-
- Overview of genomic epidemiology (older, but still relevant and clear): http://evolve.zoo.ox.ac.uk/Evolve/Oliver_Pybus_files/EvolAnalysisOfDynamicsOfViruses.pdf
13+
- Overview of genomic epidemiology (older, but still relevant and clear): https://www.nature.com/articles/nrg2583
1414

1515
Case Studies
1616
------------

docs/src/visualization/narratives.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Nextstrain Narratives allow you to pair a specific view of a dataset with text a
55

66
For examples, `see our weekly Situation Reports <https://nextstrain.org/ncov-sit-reps>`__ from the first several months of the pandemic.
77

8-
You can `read more about narratives <https://nextstrain.org/docs/narratives/introduction>`__ or `watch our Nextstrain narratives tutorial videos <https://www.youtube.com/playlist?list=PLsFWZl6SQqWxN9SkbgdjU8sylIfhZNDiW>`_. We've also `provided a template narrative file <https://github.com/nextstrain/ncov/tree/master/narratives/ncov_template_narrative.md>`__ for you to edit.
8+
You can `read more about narratives <https://nextstrain.org/docs/narratives/introduction>`__ or `watch our Nextstrain narratives tutorial videos <https://www.youtube.com/playlist?list=PLsFWZl6SQqWxN9SkbgdjU8sylIfhZNDiW>`_. We've also `provided a template narrative file <https://github.com/nextstrain/ncov/blob/-/narratives/ncov_template_narrative.md>`__ for you to edit.
99

1010
You can preview the template narrative by navigating to https://nextstrain.org/community/narratives/nextstrain/ncov/template/narrative.
1111

0 commit comments

Comments
 (0)