diff --git a/.travis.yml b/.travis.yml index 29420f4..34b14d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,15 +5,17 @@ branches: only: - master before_install: - - wget https://repo.continuum.io/miniconda/Miniconda3-4.5.11-Linux-x86_64.sh + - wget https://repo.continuum.io/miniconda/Miniconda3-4.5.12-Linux-x86_64.sh --output-document miniconda.sh - bash miniconda.sh -b -p $HOME/miniconda - source $HOME/miniconda/etc/profile.d/conda.sh - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda info --all + - conda config + --set always_yes yes + --set changeps1 no install: - conda env create --quiet --file build/environment.yml + - conda list --name manubot - conda activate manubot script: - sh build/build.sh @@ -22,5 +24,5 @@ cache: - ci/cache after_success: - test $TRAVIS_BRANCH = "master" && - test $TRAVIS_PULL_REQUEST = "false" && + test $TRAVIS_EVENT_TYPE = "push" && sh ci/deploy.sh diff --git a/build/README.md b/build/README.md index e79063b..3be7e94 100644 --- a/build/README.md +++ b/build/README.md @@ -11,7 +11,7 @@ For example, use the command `BUILD_DOCX=true sh build/build.sh`. To export DOCX for all Travis builds, set a [Travis environment variable](https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings). Currently, equation numbers via `pandoc-eqnos` are not supported for DOCX output. There is varying support for embedding images in DOCX output. -Please reference [Pull Request #40](https://github.com/greenelab/manubot-rootstock/pull/40) for possible solutions and continued discussion. +Please reference [Pull Request #40](https://github.com/manubot/rootstock/pull/40) for possible solutions and continued discussion. ## Environment diff --git a/build/assets/style.csl b/build/assets/style.csl index 07ba262..51b1f49 100644 --- a/build/assets/style.csl +++ b/build/assets/style.csl @@ -5,7 +5,7 @@ Manubot http://www.zotero.org/styles/manubot - + Daniel Himmelstein daniel.himmelstein@gmail.com diff --git a/build/build.sh b/build/build.sh index 69f6735..01f9284 100644 --- a/build/build.sh +++ b/build/build.sh @@ -33,11 +33,20 @@ pandoc --verbose \ --bibliography=$BIBLIOGRAPHY_PATH \ --csl=$CSL_PATH \ --metadata link-citations=true \ - --mathjax \ --include-after-body=build/themes/default.html \ - --include-after-body=build/plugins/analytics.html \ + --include-after-body=build/plugins/table-scroll.html \ --include-after-body=build/plugins/anchors.html \ + --include-after-body=build/plugins/accordion.html \ + --include-after-body=build/plugins/tooltips.html \ + --include-after-body=build/plugins/jump-to-first.html \ + --include-after-body=build/plugins/link-highlight.html \ + --include-after-body=build/plugins/table-of-contents.html \ + --include-after-body=build/plugins/lightbox.html \ + --mathjax \ + --variable math="" \ + --include-after-body=build/plugins/math.html \ --include-after-body=build/plugins/hypothesis.html \ + --include-after-body=build/plugins/analytics.html \ --output=output/manuscript.html \ $INPUT_PATH diff --git a/build/environment.yml b/build/environment.yml index 60e6e73..553a5db 100644 --- a/build/environment.yml +++ b/build/environment.yml @@ -3,20 +3,22 @@ channels: - conda-forge dependencies: - conda-forge::cairo=1.14.12 + - conda-forge::cairocffi=0.8.0 - conda-forge::cffi=1.11.5 - conda-forge::ghp-import=0.5.5 - conda-forge::jinja2=2.10 - conda-forge::jsonschema=2.6.0 - - conda-forge::pandas=0.23.4 - - conda-forge::pandoc=2.5 + - conda-forge::pandas=0.24.0 + - conda-forge::pandoc=2.6 - conda-forge::pango=1.40.14 - - conda-forge::python=3.6.5 + - conda-forge::psutil=5.5.1 + - conda-forge::python=3.6.7 - conda-forge::pyyaml=3.13 - conda-forge::requests=2.21.0 - conda-forge::watchdog=0.8.3 - pip: - errorhandler==2.0.1 - - git+https://github.com/greenelab/manubot@552dd99aaa148365a29a87176fedd626d4642d3c + - git+https://github.com/manubot/manubot@4505db3fd8a9dc1ba26c36f3fea9accbf02d47d8 - jsonref==0.2 - opentimestamps-client==0.6.0 - opentimestamps==0.3.0 diff --git a/build/plugins/accordion.html b/build/plugins/accordion.html new file mode 100644 index 0000000..48cc018 --- /dev/null +++ b/build/plugins/accordion.html @@ -0,0 +1,273 @@ + + + + + + + diff --git a/build/plugins/analytics.html b/build/plugins/analytics.html index 5264bbd..0e641a1 100644 --- a/build/plugins/analytics.html +++ b/build/plugins/analytics.html @@ -1,4 +1,3 @@ - - - \ No newline at end of file + + + diff --git a/build/plugins/anchors.html b/build/plugins/anchors.html index 5f4777b..92015d1 100644 --- a/build/plugins/anchors.html +++ b/build/plugins/anchors.html @@ -1,15 +1,148 @@ + + + + + + diff --git a/build/plugins/hypothesis.html b/build/plugins/hypothesis.html index bbc90f7..b38888e 100644 --- a/build/plugins/hypothesis.html +++ b/build/plugins/hypothesis.html @@ -1,2 +1,29 @@ - - + + + + + + + diff --git a/build/plugins/jump-to-first.html b/build/plugins/jump-to-first.html new file mode 100644 index 0000000..326a642 --- /dev/null +++ b/build/plugins/jump-to-first.html @@ -0,0 +1,273 @@ + + + + + + + diff --git a/build/plugins/lightbox.html b/build/plugins/lightbox.html new file mode 100644 index 0000000..ce1486d --- /dev/null +++ b/build/plugins/lightbox.html @@ -0,0 +1,604 @@ + + + + + + + + + + + diff --git a/build/plugins/link-highlight.html b/build/plugins/link-highlight.html new file mode 100644 index 0000000..bc8e6fe --- /dev/null +++ b/build/plugins/link-highlight.html @@ -0,0 +1,192 @@ + + + diff --git a/build/plugins/math.html b/build/plugins/math.html new file mode 100644 index 0000000..f1a3861 --- /dev/null +++ b/build/plugins/math.html @@ -0,0 +1,22 @@ + + + + + + + diff --git a/build/plugins/table-of-contents.html b/build/plugins/table-of-contents.html new file mode 100644 index 0000000..63e8b45 --- /dev/null +++ b/build/plugins/table-of-contents.html @@ -0,0 +1,305 @@ + + + + + + + diff --git a/build/plugins/table-scroll.html b/build/plugins/table-scroll.html new file mode 100644 index 0000000..2a4473a --- /dev/null +++ b/build/plugins/table-scroll.html @@ -0,0 +1,68 @@ + + + diff --git a/build/plugins/tooltips.html b/build/plugins/tooltips.html new file mode 100644 index 0000000..bf95eb1 --- /dev/null +++ b/build/plugins/tooltips.html @@ -0,0 +1,620 @@ + + + + + + + + + + + diff --git a/build/themes/default.html b/build/themes/default.html index 77fde56..dbbd68f 100644 --- a/build/themes/default.html +++ b/build/themes/default.html @@ -1,6 +1,6 @@ - diff --git a/ci/README.md b/ci/README.md index a8e0d1a..904ac94 100644 --- a/ci/README.md +++ b/ci/README.md @@ -1,6 +1,6 @@ # Continuous integration / analysis directory -[![Build Status](https://travis-ci.org/greenelab/manubot-rootstock.svg?branch=master)](https://travis-ci.org/greenelab/manubot-rootstock) +[![Build Status](https://travis-ci.org/indigo-dc/sqa-baseline.svg?branch=master)](https://travis-ci.org/indigo-dc/sqa-baseline) This repository uses [continuous analysis](https://doi.org/10.1101/056473 "Reproducible Computational Workflows with Continuous Analysis") to create the manuscript and commit it back to GitHub. [`deploy.sh`](deploy.sh) runs on successful `master` branch builds that are not pull requests. diff --git a/content/citation-tags.tsv b/content/citation-tags.tsv index 6de0742..94fd8ee 100644 --- a/content/citation-tags.tsv +++ b/content/citation-tags.tsv @@ -1,2 +1,2 @@ tag citation -deep_review doi:10.1101/142760 +deep-review doi:10.1098/rsif.2017.0387 diff --git a/content/images/github.svg b/content/images/github.svg index 54bbd93..2c77c4c 100644 --- a/content/images/github.svg +++ b/content/images/github.svg @@ -1,4 +1,4 @@ - - + + diff --git a/content/images/orcid.svg b/content/images/orcid.svg index 15d082c..efc939b 100644 --- a/content/images/orcid.svg +++ b/content/images/orcid.svg @@ -1,4 +1,4 @@ - - + + diff --git a/content/images/twitter.svg b/content/images/twitter.svg index 1b590e2..7f676e3 100644 --- a/content/images/twitter.svg +++ b/content/images/twitter.svg @@ -1,4 +1,4 @@ - - + +