Skip to content

Commit d3eef0f

Browse files
authored
Documentation fixes (#182)
* Fixed broken links in online documentation Fixes #169
1 parent a195c98 commit d3eef0f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+183
-142
lines changed

CHANGELOG.md

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
Note that CoMorMent containers are organized using several GitHub repositories:
99

10-
* <https://github.com/comorment/containers> - .sif files, public reference data, documentation, common scripts
11-
* <https://github.com/comorment/reference> - private reference data with access restricted to CoMorMent collaborator
10+
* [https://github.com/comorment/containers](https://github.com/comorment/containers) - .sif files, public reference data, documentation, common scripts
11+
* [https://github.com/comorment/reference](https://github.com/comorment/reference) - private reference data with access restricted to CoMorMent collaborator
1212

1313
All of the above repositories are covered by this CHANGELOG. They will have the same version tags on github.
14-
In addition, we have repositories containing specific tools, e.g. <https://github.com/comorment/HDL>,
14+
In addition, we have repositories containing specific tools, e.g. [https://github.com/comorment/HDL](https://github.com/comorment/HDL),
1515
which will be covered by their own CHANGELOG.md file.
1616

1717
To identify the version of a .sif file, run ``md5sum <container>.sif`` command and find the MD5 checksum in the list below.
@@ -35,10 +35,16 @@ If MD5 sum is not listed for a certain release then it means that the container
3535

3636
* Removals goes here
3737

38-
### Misc.
38+
### Misc
3939

4040
* Miscellaneous goes here
4141

42+
## [1.3.2] - 2023-06-12
43+
44+
### Fixed
45+
46+
* Fixed misc. issues with cross references in online documentation
47+
4248
## [1.3.1] - 2023-06-07
4349

4450
### Added
@@ -47,7 +53,7 @@ If MD5 sum is not listed for a certain release then it means that the container
4753

4854
### Fixed
4955

50-
* Fixed issue with character encoding in sumstats files, in case chromosome column name is uppercase.
56+
* Fixed issue with character encoding in sumstats files, in case chromosome column name is uppercase.
5157

5258
## [1.3.0] - 2023-05-19
5359

@@ -66,18 +72,21 @@ If MD5 sum is not listed for a certain release then it means that the container
6672
* Added ``RELEASES.md`` file explaining steps needed to make releases.
6773
* Added ``PRSice_linux`` to ``r.sif``
6874
* Added tests for ``gwas.py``
69-
* Added package ``GWASTools`` to ``r.sif``.
75+
* Added package ``GWASTools`` to ``r.sif``.
7076
* Added confidence intervals to qq plots created by ``gwas.py`` using ``GWASTools`` R package.
71-
* Added status badges and citation.cff file
77+
* Added status badges and citation.cff file
7278

7379
### Updated
7480

7581
* Updated file and folder layout, fixing minor documentation issues. Moving from ``m2r2`` to ``Myst-parser`` for Sphinx-generated online docs.
7682
* Rebuilt the R container
83+
7784
* ````
7885
1d435af6003bbca95ef8cc062bf666fc singularity/r.sif
7986
```
87+
8088
* Rebuilt the R container
89+
8190
```
8291
23d195a10b84603b15d0e8c42df40fbd singularity/r.sif
8392
```
@@ -102,7 +111,7 @@ If MD5 sum is not listed for a certain release then it means that the container
102111
103112
## [1.1] - 2022-12-01
104113
105-
Maintenance/feature release with the following main software incorporated into each container:
114+
Maintenance/feature release with the following main software incorporated into each container:
106115
107116
| container | OS/tool | version | license
108117
| ----------------- | ------------------- | ----------------------------------------- | -------------
@@ -151,24 +160,25 @@ Maintenance/feature release with the following main software incorporated into e
151160
Main changes since release version [1.0.0](https://github.com/comorment/containers/releases/tag/v1.0.0):
152161
153162
### Added
163+
154164
* add option to append ``usecases/LDpred2/ldpred.R`` score output to an existing file
155165
* add script ``usecases/LDpred2/complementSumstats.R`` to append chromosome and position to summary statistics
156166
* add polygenic score output tests for ``usecases/LDpred2/ldpred.R``
157167
* add ``usecases/LDpred2/imputeGenotypes.R`` for imputing genotypes using R-package bigSNPR
158168
* add ``usecases/LDpred2/calculateLD.R`` for calculation LD using R-package bigSNPR.
159-
* add autobuilt online documentation from repository sources at https://comorment-containers.readthedocs.io/en/latest/
169+
* add autobuilt online documentation from repository sources at <https://comorment-containers.readthedocs.io/en/latest/>
160170
* add R libraries for LDpred2 analysis to `r.sif` + corresponding example.
161171
* add tests for ``metal`` and ``qctool`` in ``gwas.sif`` build
162-
* add basic GitHub actions from https://github.com/precimed/container_template.git
172+
* add basic GitHub actions from <https://github.com/precimed/container_template.git>
163173
* add ``FaST-LMM`` (version 0.6.3) to future ``python3.sif``, and corresponding test
164174
* add ``shapeit4.2`` binary (shapeit4 v.4.2.2) and HTSlib (1.11) to future ``gwas.sif`` builds, and corresponding test
165175
* added additional tests for software in ``gwas.sif``, ``python3.sif`` builds
166-
* add versions identifiers for all explicitly installed software across ``hello.sif``, ``gwas.sif``, ``python3.sif``, ``r.sif``, listed in [docker/README.md](https://github.com/comorment/containers/docker/README.md)
176+
* add versions identifiers for all explicitly installed software across ``hello.sif``, ``gwas.sif``, ``python3.sif``, ``r.sif``, listed in [docker/README.md](./docker/README.md)
167177
* replaced Ubuntu 18.04 with 20.04 (LTS) as base image for ``hello.sif``, ``gwas.sif``, ``python3.sif``
168-
* replaced ``src/scripts/install_miniconda3.sh`` by ``scr/scripts/install_mambaforge.sh`` which is now used in future ``python3.sif`` builds
178+
* replaced ``src/scripts/install_miniconda3.sh`` by ``scr/scripts/install_mambaforge.sh`` which is now used in future ``python3.sif`` builds
169179
* add tests for bgenix and Minimac4 software in ``gwas.sif``, removing build-time dependencies for these from container
170180
* add basic test that KING software runs in ``gwas.sif``
171-
* add Dockerfiles and install scripts for `gwas.sif`, `hello.sif`, `python3.sif`, `r.sif`, `saige.sif` from [gwas](https://github.com/comorment/gwas).
181+
* add Dockerfiles and install scripts for `gwas.sif`, `hello.sif`, `python3.sif`, `r.sif`, `saige.sif` from [gwas](https://github.com/comorment/gwas).
172182
* add CHANGELOG.md (this file)
173183
* add ``gwas.py --analysis saige`` option, allowing to run SAIGE analysis
174184
* add ``gwas.py --analysis figures`` option, using R qqman for QQ and manhattan plots
@@ -183,6 +193,7 @@ Main changes since release version [1.0.0](https://github.com/comorment/containe
183193
### Updated
184194
185195
* rebuilt the following containers following version pinning in Dockerfiles, install scripts, etc. (see above additions):
196+
186197
```
187198
bb7a8e0b977e29e03067d75d19803913 singularity/gwas.sif
188199
11ac9e8fe69df07d650bd5e1e7cdeee5 singularity/hello.sif
@@ -208,13 +219,13 @@ Main changes since release version [1.0.0](https://github.com/comorment/containe
208219
* ``gwas.py --analysis loci manh qq`` options as removed (fix #22)
209220
* ``--bed-fit``, ``--bed-test``, ``--bgen-fit``, ``--bgen-test`` options of ``gwas.py`` are removed; use new options ``--geno-fit-file`` and ``--geno-file`` instead
210221
* remove ``regenie.sif`` and ``regenie3.sif``, because regenie software is also included in ``gwas.sif``
211-
* remove MiXeR package from ``python3.sif`` container, because MiXeR is now available as a separate container (<https://github.com/comorment/mixer>). This is also where you will find MiXeR's use-cases.
212-
* MAGMA, LAVA and ldblock software is moved to https://github.com/comorment/magma.
222+
* remove MiXeR package from ``python3.sif`` container, because MiXeR is now available as a separate container ([https://github.com/comorment/mixer](https://github.com/comorment/mixer)). This is also where you will find MiXeR's use-cases.
223+
* MAGMA, LAVA and ldblock software is moved to <https://github.com/comorment/magma>.
213224
MAGMA reference files are also moved to this repository.
214-
* enigma-cnv.sif and enigma-cnv.sif is moved to https://github.com/comorment/iPsychCNV
215-
enigma-cnv.sif is also available here: in https://github.com/ENIGMA-git/ENIGMA-CNV/tree/main/CNVCalling/containers
216-
* tryggve_query.sif is moved to https://github.com/comorment/Tryggve_psych
217-
* ``matlabruntime.sif`` container is moved to https://github.com/comorment/matlabruntime.
225+
* enigma-cnv.sif and enigma-cnv.sif is moved to <https://github.com/comorment/iPsychCNV>
226+
enigma-cnv.sif is also available here: in <https://github.com/ENIGMA-git/ENIGMA-CNV/tree/main/CNVCalling/containers>
227+
* tryggve_query.sif is moved to <https://github.com/comorment/Tryggve_psych>
228+
* ``matlabruntime.sif`` container is moved to <https://github.com/comorment/matlabruntime>.
218229
pleioFDR reference files are also moved to this repository.
219230
220231
## [1.0.0] - 2020-10-20

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ When you're ready to contribute code to address an open issue, please follow the
100100
Our continuous integration (CI) testing runs [a number of checks](https://github.com/comorment/containers/actions) for each pull request on [GitHub Actions](https://github.com/features/actions).
101101
You can run most of these tests locally, which is something you should do *before* opening a PR to help speed up the review process and make it easier for us.
102102

103-
And finally, please update the [CHANGELOG](https://github.com/comorment/containers/blob/main/CHANGELOG.md) with notes on your contribution in the "Unreleased" section at the top.
103+
And finally, please update the [CHANGELOG](./CHANGELOG.md) with notes on your contribution in the "Unreleased" section at the top.
104104

105105
After all of the above checks have passed, you can now open [a new GitHub pull request](https://github.com/comorment/containers/pulls).
106106
Make sure you have a clear description of the problem and the solution, and include a link to relevant issues.

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ The goal of the [CoMorMent](https://www.comorment.uio.no) containers repository
44

55
Most of these tools are packaged into singularity containers (<https://sylabs.io/singularity/>) and shared in the [singularity](https://github.com/comorment/containers/tree/main/singularity) folder of this repository. You can download individual containers using github's ``Download`` button, or clone the entire repository from command line as described in the [Getting started](#getting-started) section below.
66

7-
Most of the tools require additional [reference](reference) data, provided in the [reference](https://github.com/comorment/containers/tree/main/reference) folder of this repository.
7+
Many of the tools require additional reference data provided in the [reference](https://github.com/comorment/containers/tree/main/reference) folder of this repository.
88
Certain reference data can not be made publicly available, in which case we provide access instructions in a separate GitHub repository:
99
<https://github.com/comorment/reference>. This repository is private - please approach your contact within CoMorMent project to enable your access.
1010

11-
Description of containers and usage instructions are provided in the [docs](docs) folder.
11+
Description of containers and usage instructions are provided in the [docs](https://github.com/comorment/containers/tree/main/docs) folder.
1212

13-
More extensive use cases of containers, focusing on real data analysis, are provided in the [usecases](usecases) folder.
13+
More extensive use cases of containers, focusing on real data analysis, are provided in the [usecases](https://github.com/comorment/containers/tree/main/usecases) folder.
1414

15-
The history of changes is available in the [CHANGELOG.md](https://github.com/comorment/containers/blob/main/CHANGELOG.md) file.
15+
The history of changes is available in the [CHANGELOG.md](./CHANGELOG.md) file.
1616

1717
Additional tools are available in separate repositories:
1818

@@ -21,7 +21,7 @@ Additional tools are available in separate repositories:
2121
* <https://github.com/comorment/popcorn> - cross-ancestry genetic correlations
2222
* <https://github.com/comorment/magma> - MAGMA, LAVA, lava-partitioning tools
2323
* <https://github.com/comorment/HDL> - High-Definition Likelihood
24-
* <https://github.com/comorment/ldpred2_ref> - reference files for LDpred2. The tool itself is included in ``r.sif`` ([more info](scripts/pgs)).
24+
* <https://github.com/comorment/ldpred2_ref> - reference files for LDpred2. The tool itself is included in ``r.sif`` ([more info](https://github.com/comorment/containers/tree/main/scripts/pgs)).
2525

2626
## Project status
2727

@@ -71,8 +71,8 @@ export COMORMENT=/cluster/projects/p33/github/comorment
7171
export COMORMENT=/ess/p697/data/durable/s3-api/github/comorment
7272
```
7373

74-
Once you have a clone of this repository on your system, you may proceed with [docs/singularity/hello.md](docs/singularity/hello.md) example.
75-
Take a look at other README files in the [docs/singularity](docs/singularity) folder, as well as detailed use cases in [usecases](usecases).
74+
Once you have a clone of this repository on your system, you may proceed with [docs/singularity/hello.md](./docs/singularity/hello.md) example.
75+
Take a look at the [README](./docs/singularity/README.md) file in the [docs/singularity](https://github.com/comorment/containers/tree/main/docs/singularity) folder, as well as detailed use cases in [usecases](https://github.com/comorment/containers/tree/main/usecases).
7676

7777
To simplify instructions throughout this repository we use certain variables (it's a good idea to include them in your ``.bashrc`` or similar):
7878

@@ -90,7 +90,7 @@ Earlier version (prior to April 2021) of all containers and refrence data was di
9090
## Source files
9191

9292
The source files for configuring and building the container files provided here are found in the [docker](https://github.com/comorment/containers/tree/main/docker) directory.
93-
See the corresponding [README](docker) file therein for details.
93+
See the corresponding [README](./docker/README.md) file therein for details.
9494

9595
## Online documentation
9696

docker/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ For new users we recommend to go over introductory instructions in [docs/singula
88

99
If you would like to contribute to developing these containers, please see the [CONTRIBUTING](./../CONTRIBUTING.md) file.
1010

11-
For a tutorial on GWAS with synthetic data, see [docs/usecases/gwas_demo.md](./../docs/usecases/gwas_demo.md).
11+
For a tutorial on GWAS with synthetic data, see [usecases/gwas_demo.md](./../usecases/gwas_demo.md).
1212

1313
### Prerequisites (to running tutorials)
1414

15-
NOTE: This is out of date. Confer [docs/usecases](./../docs/usecases).
15+
NOTE: This is out of date. Confer [usecases/README.md](./../usecases/README.md).
1616

1717
* download container files shared on the [Google Drive](https://drive.google.com/drive/folders/1mfxZJ-7A-4lDlCkarUCxEf2hBIxQGO69?usp=sharing).
1818
* download ``comorment_ref.tar.gz`` file from the above Google Drive folder, extract it with ``tar -xzvf comorment_ref.tar.gz`` command,
@@ -25,7 +25,7 @@ NOTE: This is out of date. Confer [docs/usecases](./../docs/usecases).
2525

2626
## Description of available containers
2727

28-
The detailed description of the available container [files](./../singularity) provided in this repository are found [here](./../docs/singularity).
28+
The detailed description of the available container [files](https://github.com/comorment/containers/tree/main/singularity) provided in this repository are found [here](./../docs/singularity/README.md).
2929

3030
## Software versions
3131

docs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
## Singularity
44

5-
Brief descriptions of the available software container builds are available at [singularity](singularity).
5+
Brief descriptions of the available software container builds are available at [singularity](./singularity/README.md).
66

77
## Specifications
88

9-
Specifications of the input data format for GWAS anslysis, recommended in CoMorMent projects are documentat at [specifications](specifications)
9+
Specifications of the input data format for GWAS analysis, recommended in CoMorMent projects are documented at [specifications](./specifications/README.md)

docs/singularity/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Singularity
22

3-
Here is a brief overview of available container [files](./../../singularity) (more info in the links below):
3+
Here is a brief overview of available container [files](./../../singularity/README.md) (more info in the links below):
44

55
* [hello.sif](hello.md) - a simple container for demo purpose, allowing to experiment with singularity features
66
* [gwas.sif](gwas.md) - multiple tools (released as binaries/executables) for imputation and GWAS analysis

docs/singularity/gwas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ``gwas.sif`` container
22

3-
The ``gwas.sif`` container file has multiple tools related to imputation and GWAS analysis, as summarized in this [table](./../../docker#software-versions).
3+
The ``gwas.sif`` container file has multiple tools related to imputation and GWAS analysis, as summarized in this [table](./../../docker/README.md#software-versions).
44

55
Note that some specific tools (e.g. ``bolt``) are added to the path directly from their ``/tools`` folder (e.g. ``/tools/bolt``) due to hard-linked dependencies.
66
Either way, all tools can be invoked by their name, as listed above. For example:

docs/singularity/hello.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Please [let us know](https://github.com/comorment/containers/issues/new) if you
8181

8282
## TSD-specific instructions
8383

84-
The official documentation fro singularity on TSD is available [here](https://www.uio.no/english/services/it/research/sensitive-data/use-tsd/hpc/software/singularity.html). Here are more important notes about singularity on TSD:
84+
The official documentation for singularity on TSD is available [here](https://www.uio.no/english/services/it/research/sensitive-data/use-tsd/hpc/software/singularity.html). Here are more important notes about singularity on TSD:
8585
* ``module load singularity/2.6.1`` is going to be deprecated soon; instead, there will be a local installation of singularity on each Colossus node
8686
* Singularity might be unavailable on some of the interactive nodes. For example, in ``p33`` project it is recommended to run singularity on ``p33-appn-norment01`` node. You may also find it in ``p33-submit`` nodes.
8787
* You may want to run ``module purge``, to make sure you use locally installed singularity. It is good idea to run ``which singularity`` to validate this.

docs/singularity/r.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ``r.sif`` container
22

33
The ``r.sif`` container has multiple genomics tools related based on R.
4-
Please confer this [table](./../../docker#software_versions) for the more complete list.
4+
Please confer this [table](./../../docker/README.md#software-versions) for the more complete list.
55

66
In addition several standard R packages are also included (e.g. data.table, ggplot2, rmarkdown, etc.)
77

docs/specifications/sumstats_specification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The results of GWAS are represented as summary statistics, with the following co
1616
* ``L95``, ``U95`` - lower and upper 95% confidence interval of the ``BETA``.
1717
* ``P`` - p-value
1818

19-
For ``SNP``, ``CHR``, ``BP``, ``A1`` and ``A2`` columns the [gwas.py](gwas.py) script will simply copy over the information from the genetic file, i.e. from ``.bgen`` or ``.bim`` files. This means that ``SNP`` is likely to be dbSNP rs#, or some other form of identifyied such as ``CHR:BP:A1:A2``.
19+
For ``SNP``, ``CHR``, ``BP``, ``A1`` and ``A2`` columns the [scripts/gwas/gwas.py](https://github.com/comorment/containers/tree/main/scripts/gwas/gwas.py) script will simply copy over the information from the genetic file, i.e. from ``.bgen`` or ``.bim`` files. This means that ``SNP`` is likely to be dbSNP rs#, or some other form of identifyied such as ``CHR:BP:A1:A2``.
2020
For ``CHR`` and ``BP``, there we don't enforce a specific genomic build - it all depends on what build was used by the genotype data.
2121
Finally, ``A1`` and ``A2`` are not guarantied to be minor or major alleles, but ``A1`` will be used as an effect allele for signed summary statistics (i.e. ``Z`` and ``BETA`` columns).
2222

0 commit comments

Comments
 (0)