diff --git a/.github/workflows/check-current-testthat.yaml b/.github/workflows/check-current-testthat.yaml index 5ec22faa1..57668dab6 100644 --- a/.github/workflows/check-current-testthat.yaml +++ b/.github/workflows/check-current-testthat.yaml @@ -98,9 +98,9 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: testthat-snapshots + name: 'AMR-{matrix.config.os}-r{matrix.config.r}-result' path: | - /Users/runner/work/AMR/AMR/check/*[.](zip|gz) - /Users/runner/work/AMR/AMR/check/**/*[.](zip|gz) - /Users/runner/work/AMR/AMR/check/**/**/*[.](zip|gz) + /Users/runner/work/AMR/AMR/check/*.(zip|gz) + /Users/runner/work/AMR/AMR/check/**/*.(zip|gz) + /Users/runner/work/AMR/AMR/check/**/**/*.(zip|gz) if-no-files-found: warn diff --git a/.github/workflows/publish-to-pypi.yml b/.github/workflows/publish-to-pypi.yml index 5c1d589d2..fc5ed3cde 100644 --- a/.github/workflows/publish-to-pypi.yml +++ b/.github/workflows/publish-to-pypi.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest env: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + PyPI_TOKEN: ${{ secrets.PyPI }} steps: - name: Checkout code @@ -85,7 +85,7 @@ jobs: rm -rf PythonPackage git init - git remote add origin https://$GITHUB_PAT@github.com/msberends/AMR + git remote add origin https://$PyPI_TOKEN@github.com/msberends/AMR git checkout --orphan python-wrapper git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" @@ -94,4 +94,4 @@ jobs: git add . git commit -m "Python wrapper update" # git push origin python-wrapper --force - git push https://$GITHUB_PAT@github.com/msberends/AMR.git python-wrapper --force + git push https://$PyPI_TOKEN@github.com/msberends/AMR.git python-wrapper --force diff --git a/DESCRIPTION b/DESCRIPTION index e0a8b0a78..4bec57659 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9214 +Version: 2.1.1.9215 Date: 2025-03-16 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index ad4ef8171..5dc62d16c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9214 +# AMR 2.1.1.9215 *(this beta version will eventually become v3.0. We're happy to reach a new major milestone soon, which will be all about the new One Health support! Install this beta using [the instructions here](https://msberends.github.io/AMR/#latest-development-version).)* diff --git a/data-raw/gpt_training_text_v2.1.1.9214.txt b/data-raw/gpt_training_text_v2.1.1.9215.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9214.txt rename to data-raw/gpt_training_text_v2.1.1.9215.txt index 8d0496d1c..9973c3347 100644 --- a/data-raw/gpt_training_text_v2.1.1.9214.txt +++ b/data-raw/gpt_training_text_v2.1.1.9215.txt @@ -1,6 +1,6 @@ This knowledge base contains all context you must know about the AMR package for R. You are a GPT trained to be an assistant for the AMR package in R. You are an incredible R specialist, especially trained in this package and in the tidyverse. -First and foremost, you are trained on version 2.1.1.9214. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9215. Remember this whenever someone asks which AMR package version you’re at. Below are the contents of the NAMESPACE file, the index.md file, and all the man/*.Rd files (documentation) in the package. Every file content is split using 100 hypens. ----------------------------------------------------------------------------------------------------