P281424/AMR
1
0
Fork 0
mirror of https://github.com/msberends/AMR.git synced 2025-10-31 07:28:17 +01:00
Code Releases Activity

(v3.0.0.9030) fix NEWS

Browse Source
This commit is contained in:
dr. M.S. (Matthijs) Berends
2025-09-11 14:41:28 +02:00
parent c7b2acbeb6
commit 5b99888151
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/prehooks/pre-commit vendored
View File

@@ -48,7 +48,6 @@ echo "Running prehook..."
if command -v Rscript > /dev/null; then if command -v Rscript > /dev/null; then
if [ "$(Rscript -e 'cat(all(c('"'pkgload'"', '"'devtools'"', '"'dplyr'"') %in% rownames(installed.packages())))')" = "TRUE" ]; then if [ "$(Rscript -e 'cat(all(c('"'pkgload'"', '"'devtools'"', '"'dplyr'"') %in% rownames(installed.packages())))')" = "TRUE" ]; then
Rscript -e "source('data-raw/_pre_commit_checks.R')" Rscript -e "source('data-raw/_pre_commit_checks.R')"
currentpkg=$(Rscript -e "cat(pkgload::pkg_name())")
echo "- Adding changed files in ./data-raw and ./man to this commit" echo "- Adding changed files in ./data-raw and ./man to this commit"
git add data-raw/* git add data-raw/*
git add data/* git add data/*
@@ -57,11 +56,9 @@ if command -v Rscript > /dev/null; then
git add NAMESPACE git add NAMESPACE
else else
echo "- R package 'pkgload', 'devtools', or 'dplyr' not installed!" echo "- R package 'pkgload', 'devtools', or 'dplyr' not installed!"
currentpkg="your"
fi fi
else else
echo "- R is not available on your system!" echo "- R is not available on your system!"
currentpkg="your"
fi fi
echo "" echo ""
@@ -92,7 +89,7 @@ else
# Combine tag and commit number # Combine tag and commit number
currentversion="$currenttag.$((currentcommit + 9001))" currentversion="$currenttag.$((currentcommit + 9001))"
echo "- ${currentpkg} pkg version set to ${currentversion}" echo "- AMR pkg version set to ${currentversion}"
# Update version number and date in DESCRIPTION # Update version number and date in DESCRIPTION
sed -i -- "s/^Version: .*/Version: ${currentversion}/" DESCRIPTION sed -i -- "s/^Version: .*/Version: ${currentversion}/" DESCRIPTION
@@ -103,10 +100,7 @@ else
# Update version number in NEWS.md # Update version number in NEWS.md
if [ -e "NEWS.md" ]; then if [ -e "NEWS.md" ]; then
if [ "$currentpkg" = "your" ]; then sed -i -- "1s/.*/# AMR ${currentversion}/" NEWS.md
currentpkg=""
fi
sed -i -- "1s/.*/# ${currentpkg} ${currentversion}/" NEWS.md
echo "- Updated version number in ./NEWS.md" echo "- Updated version number in ./NEWS.md"
rm -f NEWS.md-- rm -f NEWS.md--
git add NEWS.md git add NEWS.md

1
.gitignore vendored
View File

@@ -1,5 +1,6 @@
Meta Meta
doc doc
docs
.Renviron .Renviron
.Rproj.user .Rproj.user
.Rhistory .Rhistory

4
DESCRIPTION
View File

@@ -1,6 +1,6 @@
Package: AMR Package: AMR
Version: 3.0.0.9029 Version: 3.0.0.9030
Date: 2025-09-10 Date: 2025-09-11
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

2
NEWS.md
View File

@@ -1,4 +1,4 @@
# 3.0.0.9029 # AMR 3.0.0.9030
This is a bugfix release following the release of v3.0.0 in June 2025. This is a bugfix release following the release of v3.0.0 in June 2025.