diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..ff3ca24 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +/.github export-ignore +.gitattributes export-ignore +.gitignore export-ignore + +_pkgdown.yml export-ignore +codecov.yml export-ignore diff --git a/DESCRIPTION b/DESCRIPTION index 78913c9..0ee3a1c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: gamma Title: Dose Rate Estimation from in-Situ Gamma-Ray Spectrometry Measurements -Version: 1.0.3.9000 +Version: 1.0.4 Authors@R: c( person("Nicolas", "Frerebeau", , "nicolas.frerebeau@u-bordeaux-montaigne.fr", role = "aut", comment = c(ORCID = "0000-0001-5759-4944")), diff --git a/NEWS.md b/NEWS.md index 43498a3..21a21a1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# gamma 1.0.3.9000 +# gamma 1.0.4 ## Bugfixes & changes * Fix the metadata when reading a CNF file: do not use a fixed index to isolate particular metadata (the number of metadata may vary depending on the user's acquisition). * Fix `set_energy<-` so that argument `value` appears in the method at the end of the argument list. diff --git a/R/gamma-package.R b/R/gamma-package.R index 22ed3d9..f5e76a0 100644 --- a/R/gamma-package.R +++ b/R/gamma-package.R @@ -2,7 +2,7 @@ #' \tabular{ll}{ #' **Package:** \tab gamma \cr #' **Type:** \tab Package \cr -#' **Version:** \tab 1.0.3 \cr +#' **Version:** \tab 1.0.4 \cr #' **License:** \tab GPL-3 \cr #' **Zenodo:** \tab \doi{10.5281/zenodo.2652393} #' } diff --git a/README.Rmd b/README.Rmd index 77e6c96..fa582e7 100644 --- a/README.Rmd +++ b/README.Rmd @@ -16,7 +16,7 @@ knitr::opts_chunk$set( # gamma -[![R-CMD-check](https://github.com/crp2a/gamma/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/crp2a/gamma/actions/workflows/R-CMD-check.yaml) +[![R-CMD-check](https://github.com/crp2a/gamma/workflows/R-CMD-check/badge.svg)](https://github.com/crp2a/gamma/actions) [![codecov](https://codecov.io/gh/crp2a/gamma/branch/master/graph/badge.svg)](https://app.codecov.io/gh/crp2a/gamma) [![r-universe](https://crp2a.r-universe.dev/badges/gamma)](https://crp2a.r-universe.dev){.pkgdown-devel} diff --git a/README.md b/README.md index 958d45d..cf04a73 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ -[![R-CMD-check](https://github.com/crp2a/gamma/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/crp2a/gamma/actions/workflows/R-CMD-check.yaml) +[![R-CMD-check](https://github.com/crp2a/gamma/workflows/R-CMD-check/badge.svg)](https://github.com/crp2a/gamma/actions) [![codecov](https://codecov.io/gh/crp2a/gamma/branch/master/graph/badge.svg)](https://app.codecov.io/gh/crp2a/gamma) , R package version 1.0.3. + , R package version 1.0.4. ## Installation @@ -76,7 +76,6 @@ remotes::install_github("crp2a/gamma") ``` r ## A minimal example library(gamma) -library(magrittr) ## Find the full path to the spectrum file spc_file <- system.file("extdata/LaBr.CNF", package = "gamma") diff --git a/codemeta.json b/codemeta.json index f901a1a..a651ff9 100644 --- a/codemeta.json +++ b/codemeta.json @@ -8,7 +8,7 @@ "codeRepository": "https://github.com/crp2a/gamma", "issueTracker": "https://github.com/crp2a/gamma/issues", "license": "https://spdx.org/licenses/GPL-3.0", - "version": "1.0.3.9000", + "version": "1.0.4", "programmingLanguage": { "@type": "ComputerLanguage", "name": "R", @@ -237,7 +237,7 @@ }, "SystemRequirements": null }, - "fileSize": "3983.42KB", + "fileSize": "3983.446KB", "citation": [ { "@type": "ScholarlyArticle", @@ -299,7 +299,7 @@ }, { "@type": "SoftwareSourceCode", - "datePublished": "2022", + "datePublished": "2023", "author": [ { "@type": "Person", @@ -319,14 +319,13 @@ ], "name": "{gamma: Dose Rate Estimation from in-Situ Gamma-Ray Spectrometry}", "identifier": "10.5281/zenodo.2652393", - "description": "R package version 1.0.3", + "description": "R package version 1.0.4", "@id": "https://doi.org/10.5281/zenodo.2652393", "sameAs": "https://doi.org/10.5281/zenodo.2652393" } ], - "releaseNotes": "https://github.com/crp2a/gamma/blob/master/NEWS.md", "readme": "https://github.com/crp2a/gamma/blob/master/README.md", - "contIntegration": ["https://github.com/crp2a/gamma/actions/workflows/R-CMD-check.yaml", "https://app.codecov.io/gh/crp2a/gamma"], + "contIntegration": ["https://github.com/crp2a/gamma/actions", "https://app.codecov.io/gh/crp2a/gamma"], "developmentStatus": "https://www.repostatus.org/#active", "keywords": ["luminescence-dating", "geochronology", "archaeology", "r-package", "gamma-spectrometry"] } diff --git a/cran-comments.md b/cran-comments.md index cf9a0f5..025f9a7 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Test environments -* Local R installation: R 4.2.1 +* Local R installation: R 4.3.0 * Ubuntu (on GitHub Actions): R devel, release, oldrel * Windows (on GitHub Actions and win-builder): R devel, release, oldrel * MacOS (on GitHub Actions): R release @@ -10,3 +10,4 @@ 0 errors | 0 warnings | 1 note * Some links in the documentation point to articles behind paywalls that may return a 403 error. +* CRAN package check errors have been fixed. diff --git a/inst/CITATION b/inst/CITATION index 3c99b4e..c6a7803 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -22,9 +22,9 @@ bibentry( person("Brice", "Lebrun", role = "aut"), person("Guilhem", "Paradol", role = "aut")), title = "{gamma: Dose Rate Estimation from in-Situ Gamma-Ray Spectrometry}", - year = "2022", + year = "2023", organization = "Université Bordeaux Montaigne", address = "Pessac, France", - note = "R package version 1.0.3", + note = sprintf("R package version %s", meta$Version), doi = "10.5281/zenodo.2652393" ) diff --git a/man/gamma-package.Rd b/man/gamma-package.Rd index 5231810..a1693e8 100644 --- a/man/gamma-package.Rd +++ b/man/gamma-package.Rd @@ -15,7 +15,7 @@ Process in-situ Gamma-Ray Spectrometry for Luminescence Dating. This package all \tabular{ll}{ \strong{Package:} \tab gamma \cr \strong{Type:} \tab Package \cr -\strong{Version:} \tab 1.0.3 \cr +\strong{Version:} \tab 1.0.4 \cr \strong{License:} \tab GPL-3 \cr \strong{Zenodo:} \tab \doi{10.5281/zenodo.2652393} }