5 Commits
Author SHA1 Message Date
dr. M.S. (Matthijs) Berends e05d0365a9 website update 2022-08-25 19:19:16 +02:00
dr. M.S. (Matthijs) Berends 5501cffbb0 website update 2022-08-25 19:18:48 +02:00
dr. M.S. (Matthijs) Berends d3000a9492 website update 2022-08-25 19:16:16 +02:00
dr. M.S. (Matthijs) Berends 2cbce2cefa website update 2022-08-25 19:14:07 +02:00
dr. M.S. (Matthijs) Berends 53c4b37252 website update 2022-08-25 19:11:02 +02:00
4 changed files with 17 additions and 18 deletions
+3 -3
View File
@@ -5,7 +5,7 @@ echo "Running pre-commit hook..."
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo ">> Updating R documentation..." echo ">> Updating R documentation..."
if command -v Rscript > /dev/null; then if command -v Rscript > /dev/null; then
if [ "$(Rscript -e 'cat(all(c('"'roxygen2'"', '"'pkgload'"') %in% rownames(installed.packages())))')" == "TRUE" ]; then if "$(Rscript -e 'cat(all(c('"'roxygen2'"', '"'pkgload'"') %in% rownames(installed.packages())))')" == "TRUE"; then
Rscript -e "suppressMessages(roxygen2::roxygenise())" Rscript -e "suppressMessages(roxygen2::roxygenise())"
currentpkg=`Rscript -e "cat(pkgload::pkg_name())"` currentpkg=`Rscript -e "cat(pkgload::pkg_name())"`
git add man/* git add man/*
@@ -53,7 +53,7 @@ sed -i -- "s/^Version: .*/Version: ${currentversion}/" DESCRIPTION
sed -i -- "s/^Date: .*/Date: $(date '+%Y-%m-%d')/" DESCRIPTION sed -i -- "s/^Date: .*/Date: $(date '+%Y-%m-%d')/" DESCRIPTION
echo ">> - updated DESCRIPTION" echo ">> - updated DESCRIPTION"
# remove leftover on macOS # remove leftover on macOS
rm DESCRIPTION-- rm -f DESCRIPTION--
# add to commit # add to commit
git add DESCRIPTION git add DESCRIPTION
@@ -62,7 +62,7 @@ if [ -e "NEWS.md" ]; then
sed -i -- "1s/.*/# ${currentpkg} ${currentversion}/" NEWS.md sed -i -- "1s/.*/# ${currentpkg} ${currentversion}/" NEWS.md
echo ">> - updated NEWS.md" echo ">> - updated NEWS.md"
# remove leftover on macOS # remove leftover on macOS
rm NEWS.md-- rm -f NEWS.md--
# add to commit # add to commit
git add NEWS.md git add NEWS.md
else else
+2 -2
View File
@@ -1,6 +1,6 @@
Package: AMR Package: AMR
Version: 1.8.1.9021 Version: 1.8.1.9026
Date: 2022-08-21 Date: 2022-08-25
Title: Antimicrobial Resistance Data Analysis Title: Antimicrobial Resistance Data Analysis
Description: Functions to simplify and standardise antimicrobial resistance (AMR) Description: Functions to simplify and standardise antimicrobial resistance (AMR)
data analysis and to work with microbial and antimicrobial properties by data analysis and to work with microbial and antimicrobial properties by
+1 -1
View File
@@ -1,4 +1,4 @@
# AMR 1.8.1.9021 # your 1.8.1.9026
### New ### New
* EUCAST 2022 and CLSI 2022 guidelines have been added for `as.rsi()`. EUCAST 2022 is now the new default guideline for all MIC and disks diffusion interpretations. * EUCAST 2022 and CLSI 2022 guidelines have been added for `as.rsi()`. EUCAST 2022 is now the new default guideline for all MIC and disks diffusion interpretations.
+4 -5
View File
@@ -32,7 +32,7 @@ template:
assets: "pkgdown/logos" # use logos in this folder assets: "pkgdown/logos" # use logos in this folder
bslib: bslib:
code_font: {google: "Fira Code"} code_font: {google: "Fira Code"}
body-text-align: "justify" # body-text-align: "justify"
line-height-base: 1.75 line-height-base: 1.75
# the green "success" colour of this bootstrap theme should be the same as the green in our logo # the green "success" colour of this bootstrap theme should be the same as the green in our logo
success: "#128f76" success: "#128f76"
@@ -99,9 +99,9 @@ navbar:
- text: "Get properties of an antibiotic" - text: "Get properties of an antibiotic"
icon: "fa-capsules" icon: "fa-capsules"
href: "reference/ab_property.html" # reference instead of an article href: "reference/ab_property.html" # reference instead of an article
- text: "Other: benchmarks" # - text: "Other: benchmarks"
icon: "fa-shipping-fast" # icon: "fa-shipping-fast"
href: "articles/benchmarks.html" # href: "articles/benchmarks.html"
- text: "Manual" - text: "Manual"
icon: "fa-book-open" icon: "fa-book-open"
href: "reference/index.html" href: "reference/index.html"
@@ -224,4 +224,3 @@ reference:
in a future version. in a future version.
contents: contents:
- "`AMR-deprecated`" - "`AMR-deprecated`"