From 5b99888151b06dd362b0453789d20edede59d3f2 Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Thu, 11 Sep 2025 14:41:28 +0200 Subject: [PATCH] (v3.0.0.9030) fix NEWS --- .github/prehooks/pre-commit | 10 ++-------- .gitignore | 1 + DESCRIPTION | 4 ++-- NEWS.md | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/prehooks/pre-commit b/.github/prehooks/pre-commit index b038d65a1..08a12a134 100755 --- a/.github/prehooks/pre-commit +++ b/.github/prehooks/pre-commit @@ -48,7 +48,6 @@ echo "Running prehook..." if command -v Rscript > /dev/null; 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')" - currentpkg=$(Rscript -e "cat(pkgload::pkg_name())") echo "- Adding changed files in ./data-raw and ./man to this commit" git add data-raw/* git add data/* @@ -57,11 +56,9 @@ if command -v Rscript > /dev/null; then git add NAMESPACE else echo "- R package 'pkgload', 'devtools', or 'dplyr' not installed!" - currentpkg="your" fi else echo "- R is not available on your system!" - currentpkg="your" fi echo "" @@ -92,7 +89,7 @@ else # Combine tag and commit number 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 sed -i -- "s/^Version: .*/Version: ${currentversion}/" DESCRIPTION @@ -103,10 +100,7 @@ else # Update version number in NEWS.md if [ -e "NEWS.md" ]; then - if [ "$currentpkg" = "your" ]; then - currentpkg="" - fi - sed -i -- "1s/.*/# ${currentpkg} ${currentversion}/" NEWS.md + sed -i -- "1s/.*/# AMR ${currentversion}/" NEWS.md echo "- Updated version number in ./NEWS.md" rm -f NEWS.md-- git add NEWS.md diff --git a/.gitignore b/.gitignore index 7f5190bc7..f5039d617 100755 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ Meta doc +docs .Renviron .Rproj.user .Rhistory diff --git a/DESCRIPTION b/DESCRIPTION index 1b57b68b4..f2d93e9f0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 3.0.0.9029 -Date: 2025-09-10 +Version: 3.0.0.9030 +Date: 2025-09-11 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) data analysis and to work with microbial and antimicrobial properties by diff --git a/NEWS.md b/NEWS.md index 5fe431bcc..418492f53 100644 --- a/NEWS.md +++ b/NEWS.md @@ -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.