Skip to content

Commit

Permalink
Update website
Browse files Browse the repository at this point in the history
  • Loading branch information
bodkan committed Aug 2, 2022
1 parent 39f44da commit 65228d3
Show file tree
Hide file tree
Showing 34 changed files with 288 additions and 257 deletions.
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
.PHONY: build vignettes docs

version := $(shell less DESCRIPTION | grep 'Version' | sed 's/Version: \(.*\)$$/\1/')
pkg := build/admixr_$(version).tar.gz

docs:
rm -rf docs/reference
R -e 'devtools::document()'
R -e 'pkgdown::build_reference(examples = FALSE)'
R -e 'pkgdown::build_reference()'
R -e 'pkgdown::build_reference_index()'
R -e 'pkgdown::build_news()'

website:
rm -rf docs/
R -e 'devtools::install(upgrade = "never")'
R -e 'knitr::knit("README.Rmd", output = "README.md")'
R -e 'devtools::document()'
R -e 'pkgdown::build_site(examples = FALSE)'
# git restore docs/pkgdown.yml
R -e 'pkgdown::build_site()'

build: $(pkg)

Expand All @@ -30,15 +32,18 @@ winold: README.md
R -e 'devtools::check_win_oldrelease()'

rhub: README.md
R -e 'rhub::check_for_cran()'
R -e 'rhub::check_for_cran(platforms = c("macos-highsierra-release", "macos-highsierra-release-cran", "macos-m1-bigsur-release"))'

$(pkg): README.md
R -e 'devtools::document()'
mkdir -p build; cd build; R CMD build --log ../../admixr
mkdir -p build; cd build; R CMD build --log ../../slendr

README.md: README.Rmd
README.md: README.Rmd $(logo)
R -e 'devtools::install(upgrade = "never")'
R -e 'knitr::knit("README.Rmd", output = "README.md")'

example_data:
Rscript generate_examples.R

clean:
rm -rf build
4 changes: 2 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ continues to be developed and maintained, _admixr_ remains relevant and useful a
will continue to be supported. ADMIXTOOLS might have a smaller set of features than
ADMIXTOOLS 2, but the features it provides are extremely stable. ADMIXTOOLS is one of
the most battle-tested pieces of software in population genetics—if you're happy with
the set of features it provides, there is no real reason to move away from it (and
from _admixr_).
the set of features it provides and if you're happy with _admixr_ itself, there is no
dramatic reason to move away from either of them.

## More information

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ continues to be developed and maintained, _admixr_ remains relevant and useful a
will continue to be supported. ADMIXTOOLS might have a smaller set of features than
ADMIXTOOLS 2, but the features it provides are extremely stable. ADMIXTOOLS is one of
the most battle-tested pieces of software in population genetics—if you're happy with
the set of features it provides, there is no real reason to move away from it (and
from _admixr_).
the set of features it provides and if you're happy with _admixr_ itself, there is no
dramatic reason to move away from either of them.

## More information

Expand Down
2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/LICENSE-text.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/LICENSE.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions docs/articles/qpAdm.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 65228d3

Please sign in to comment.