Skip to content

Commit

Permalink
Merge branch 'master' into patch-4
Browse files Browse the repository at this point in the history
  • Loading branch information
rando2 authored Jan 6, 2022
2 parents 23afa98 + 68ff926 commit a19d47f
Show file tree
Hide file tree
Showing 69 changed files with 16,110 additions and 1,494 deletions.
21 changes: 16 additions & 5 deletions .github/workflows/update-external-resources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ on:
schedule:
# Run every day at 00:00
- cron: '0 0 * * *'
# Enable manually updating the external resources
workflow_dispatch:

jobs:
update_external_resources:
Expand All @@ -21,6 +23,9 @@ jobs:
environment-file: environment.yml
auto-activate-base: false
miniconda-version: 'latest'
- name: List packages in conda environment
shell: bash --login {0}
run: conda list
- name: Update JHU CSSE data
shell: bash --login {0}
run: bash csse/generate-csse-stats.sh
Expand All @@ -30,26 +35,32 @@ jobs:
- name: Update OWID data
shell: bash --login {0}
run: bash owiddata/generate-owiddata-stats.sh
- name: Commit JHU CSSE and EBM Data Lab figures
- name: Update CORD-19 data
shell: bash --login {0}
run: bash CORD-19/generate-cord19-stats.sh
# - name: Update manuscript statistics data
# shell: bash --login {0}
# run: bash analyze-ms-stats/calc-manuscript-stats.sh
- name: Commit JHU CSSE, EBM Data Lab, OWID, CORD-19, and manuscript growth figures
uses: EndBug/add-and-commit@v4
with:
add: '*/*.png */*.svg'
add: '*/*.png */*.svg */*/*.png */*/*.svg'
author_name: GitHub Actions
author_email: [email protected]
message: 'Update JHU CSSE and EBM Data Lab figures'
message: 'Update JHU CSSE, EBM Data Lab, OWID, CORD-19, and manuscript growth figures'
ref: external-resources
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update figure versions
shell: bash --login {0}
run: bash version-figures.sh
- name: Commit JHU CSSE, EBM Data Lab, and OWID statistics
- name: Commit JHU CSSE, EBM Data Lab, OWID, CORD-19, and manuscript growth statistics
uses: EndBug/add-and-commit@v4
with:
add: '*/*.json'
author_name: GitHub Actions
author_email: [email protected]
message: 'Update JHU CSSE, EBM Data Lab, and OWID statistics'
message: 'Update JHU CSSE, EBM Data Lab, OWID, CORD-19, and manuscript growth statistics'
ref: external-resources
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Thumbs.db

## Text Editors
.vscode
.idea

## Spellcheck script
spellcheck.lua
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,18 @@
[![Gitter](https://badges.gitter.im/covid19-review/community.svg)](https://gitter.im/covid19-review/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
<!-- usage note: delete CI badges above for services not used by your manuscript -->

Project Status:
| Section | Title | Status Issue | Submission Status | Venue | Links
| -- | -- | -- | -- |-- | -- |
| [Pathogenesis](https://greenelab.github.io/covid19-review/#pathogenesis-symptomatology-and-transmission-of-sars-cov-2-through-analysis-of-viral-genomics-and-structure) | Pathogenesis, Symptomatology, and Transmission of SARS-CoV-2 through Analysis of Viral Genomics and Structure | ✔️ | [Published](https://doi.org/10.1128/mSystems.00095-21) 🎉 | _mSystems_ | [Release](https://github.com/greenelab/covid19-review/releases/tag/pathogenesis-v3); [Preprint](http://arxiv.org/abs/2102.01521)
| [Evolution](https://greenelab.github.io/covid19-review/#evolutionary-and-genomic-analysis-of-sars-cov-2) | TBD | #867 | TBD | In prep
| [Diagnostics](https://greenelab.github.io/covid19-review/#diagnostics) | TBD | #818 | TBD | In prep
| [Pharmaceuticals](https://greenelab.github.io/covid19-review/#identification-and-development-of-therapeutics-for-covid-19) | Identification and Development of Therapeutics for COVID-19 | ✔️ | [Published](https://doi.org/10.1128/mSystems.00233-21) 🎉 | _mSystems_ | [Release](https://github.com/greenelab/covid19-review/releases/tag/pharmaceuticals-v3); [Preprint](http://arxiv.org/abs/2103.02723)
| [Vaccines](https://greenelab.github.io/covid19-review/#vaccine-development-strategies-for-sars-cov-2) | TBD | #830 | Next priority | In prep
| [Nutraceuticals](https://greenelab.github.io/covid19-review/#dietary-supplements-and-nutraceuticals-under-investigation-for-covid-19-prevention-and-treatment) | Dietary Supplements and Nutraceuticals Under Investigation for COVID-19 Prevention and Treatment | ✔️ | [Published](https://doi.org/10.1128/mSystems.00122-21) 🎉 | _mSystems_ | [Release](https://github.com/greenelab/covid19-review/releases/tag/nutraceuticals-v2); [Preprint](http://arxiv.org/abs/2102.02250) |
| [Social Determinants of Health](https://greenelab.github.io/covid19-review/#social-factors-influencing-covid-19-exposure-and-outcomes) | TBD | #868 | TBD | In prep
| [Methods (Cyberinfrastructure)](https://greenelab.github.io/covid19-review/#an-open-publishing-response-to-the-covid-19-infodemic) | An Open-Publishing Response to the COVID-19 Infodemic | ✔️ | [Published](http://ceur-ws.org/Vol-2976/paper-2.pdf) 🎉 | [DISCO 2021](https://infoqualitylab.org/events/disco2021/) | [Release](https://github.com/greenelab/covid19-review/releases/tag/methods-v4); [Preprint](https://arxiv.org/abs/2109.08633)

## Code of Conduct

This project operates under a code of conduct.
Expand Down
33 changes: 30 additions & 3 deletions SETUP.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Table of contents

- [Creating a new manuscript](#creating-a-new-manuscript)
* [Configuration](#configuration)
* [Using setup script](#using-setup-script)
* [Manual configuration](#manual-configuration)
* [Create repository](#create-repository)
* [Continuous integration](#continuous-integration)
+ [GitHub Actions](#github-actions)
Expand All @@ -27,8 +28,33 @@ These steps should be performed in a command-line shell (terminal), starting in
Setup is supported on Linux, macOS, and Windows.
Windows setup requires [Git Bash](https://gitforwindows.org/) or [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/faq).

## Configuration
## Using setup script
Creating a new manuscript using GitHub actions, the recommended default CI service (see below), can be achieved easily using the [setup script](https://github.com/manubot/rootstock/blob/main/setup.bash).
This simply runs the steps detailed below in the manual configuration.

Use the command below to copy `setup.bash` and run it.
You can check the code that will be executed [here](https://github.com/manubot/rootstock/blob/main/setup.bash).

````sh
bash <( curl --location https://github.com/manubot/rootstock/raw/main/setup.bash )
````
The script will then take you through the process of cloning the rootstock repo, make the changes required to use GitHub actions, edit the README to point to your repo and commit the changes.
Your new manuscript repo is then ready for you to start adding your own content.

This script does not not create the remote repo for you, so you will be prompted to manually create an empty GitHub repository at <https://github.com/new>.
Do not initialize the repository, other than optionally adding a description.

### CLI
There is also a command line interface for users who want to create manuscripts at scale and in an automated way.
See the help for details.

````sh
bash setup.bash --help
````

## Manual configuration

If you do not wish to use the above setup script to configure your new manuscript repository, you can instead execute the steps manually.
First, you must configure two environment variables (`OWNER` and `REPO`).
These variables specify the GitHub repository for the manuscript (i.e. `https://github.com/OWNER/REPO`).
Make sure that the case of `OWNER` matches how your username is displayed on GitHub.
Expand Down Expand Up @@ -63,7 +89,8 @@ git remote set-url origin https://github.com/$OWNER/$REPO.git
git remote set-url origin [email protected]:$OWNER/$REPO.git
```

Next, you must manually create an empty GitHub repository at <https://github.com/new>.
Then create an empty repository on GitHub.
You can do this at <https://github.com/new> or via the [GitHub command line interface](https://github.com/cli/cli) (if installed) with `gh repo create`.
Make sure to use the same "Owner" and "Repository name" specified above.
Do not initialize the repository, other than optionally adding a Description.
Next, push your cloned manuscript:
Expand Down
25 changes: 17 additions & 8 deletions USAGE.md
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,23 @@ Note that multiple citations must be semicolon separated.
Be careful not to cite the same study using identifiers from multiple sources.
For example, the following citations all refer to the same study, but will be treated as separate references: `[@doi:10.7717/peerj.705; @pmc:PMC4304851; @pubmed:25648772]`.

Citation keys must adhere to the syntax described in the [Pandoc manual](https://pandoc.org/MANUAL.html#citations):

> The citation key must begin with a letter, digit, or `_`, and may contain alphanumerics, `_`, and internal punctuation characters (`:.#$%&-+?<>~/`).
To evaluate whether a citation key fully matches this syntax, try [this online regex](https://regex101.com/r/mXZyY2/latest).
If the citation key is not valid, use the [citation aliases](#citation-aliases) workaround below.
This is required for citation keys that contain forbidden characters such as `;` or `=` or end with a non-alphanumeric character such as `/`.
<!-- See [jgm/pandoc#6026](https://github.com/jgm/pandoc/issues/6026) for progress on a more flexible Markdown citation key syntax. -->
The citation key syntax is described in the [Pandoc manual](https://pandoc.org/MANUAL.html#citation-syntax):

> Unless a citation key start with a letter, digit, or `_`,
> and contains only alphanumerics and internal punctuation characters (`:.#$%&-+?<>~/`),
> it must be surrounded by curly braces,
> which are not considered part of the key.
> In `@Foo_bar.baz.`, the key is `Foo_bar.baz`.
> The final period is not *internal* punctuation,
> so it is not included in the key.
> In `@{Foo_bar.baz.}`, the key is `Foo_bar.baz.`, including the final period.
> The curly braces are recommended if you use URLs as keys:
> `[@{https://example.com/bib?name=foobar&date=2000}, p. 33]`.
If a citation key does not fully match [this online regex](https://regex101.com/r/mXZyY2/latest)
(for example, contains characters such as `;` or `=` or end with a non-alphanumeric character such as `/`),
make sure to surround it with curly braces or use the [citation aliases](#citation-aliases) workaround below.
<!-- See [jgm/pandoc#6026](https://github.com/jgm/pandoc/issues/6026) on the curly-brace syntax for Markdown citation keys, which was introduced in Pandoc 2.14. -->

Prior to Rootstock commit [`6636b91`](https://github.com/manubot/rootstock/commit/6636b912c6b41593acd2041d34cd4158c1b317fb) on 2020-01-14, Manubot processed citations separately from Pandoc.
Switching to a Pandoc filter improved reliability on complex documents, but restricted the syntax of citation keys slightly.
Expand Down
126 changes: 126 additions & 0 deletions build/assets/acm-pandoc-conf.tex
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
% Adaptation of the template by Wouter Groeneveld
% https://brainbaking.com/post/2021/02/writing-academic-papers-in-markdown/

\documentclass[sigconf]{acmart}

\usepackage{balance} % balancing bibstyles as per request in accepted submission


%% These commands are for a PROCEEDINGS abstract or paper.
$for(acm)$
\copyrightyear{$acm.copyrightyear$}
\acmYear{$acm.copyrightyear$}
\setcopyright{$acm.copyright$}
\acmConference[$acm.conference$]{$acm.conferencetitle$}{$acm.date$}{$acm.location$}
\acmBooktitle{$acm.booktitle$}
\acmPrice{$acm.price$}
\acmISBN{$acm.bookisbn$}
\acmDOI{$acm.doi$}
$endfor$

$for(header-includes)$
$header-includes$
$endfor$


$for(author)$
\author{$author.name$}
$if(author.orcid)$
\orcid{$author.orcid$}
$endif$
$for(author.affiliations)$
\affiliation{
$if(author.affiliations.institution)$
\institution{$author.affiliations.institution$}
$endif$
$if(author.affiliations.department)$
\department{$author.affiliations.department$}
$endif$
$if(author.affiliations.city)$
\city{$author.affiliations.city$}
$endif$
$if(author.affiliations.state)$
\state{$author.affiliations.state$}
$endif$
$if(author.affiliations.country)$
\country{$author.affiliations.country$}
$endif$
}
$endfor$
$for(author.additionalaffiliations)$
\additionalaffiliation{
$if(author.additionalaffiliations.institution)$
\institution{$author.additionalaffiliations.institution$}
$endif$
$if(author.additionalaffiliations.department)$
\department{$author.additionalaffiliations.department$}
$endif$
$if(author.additionalaffiliations.city)$
\city{$author.additionalaffiliations.city$}
$endif$
$if(author.additionalaffiliations.state)$
\state{$author.additionalaffiliations.state$}
$endif$
$if(author.additionalaffiliations.country)$
\country{$author.additionalaffiliations.country$}
$endif$
}
$endfor$
$if(author.email)$
\email{$author.email$}
$endif$
$endfor$

$if(final)$
$if(poster)$
\settopmatter{printacmref=false, printfolios=false}
$else$
\settopmatter{printacmref=true}
$endif$
$endif$

\begin{document}

$if(final)$
\fancyhead{}
$endif$

$if(title)$
\title{$title$}
$endif$
$if(subtitle)$
\subtitle{$subtitle$}
$endif$


$if(abstract)$
\begin{abstract}
$abstract$
\end{abstract}
$endif$


\renewcommand{\shortauthors}{$shortauthors$}


\maketitle
\bibliographystyle{ACM-Reference-Format}

$if(conflicts)$
{\let\thefootnote\relax\footnote{$conflicts$}}
$endif$

$body$

% Add funding statement as a comment so it can be manually reviewed and condensed
$if(funding)$
%{$funding$}
$endif$

$if(bibfile)$
\balance
\bibliography{$bibfile$}
$endif$

\end{document}
\endinput
Loading

0 comments on commit a19d47f

Please sign in to comment.