Skip to content

Commit

Permalink
Prepare for next release
Browse files Browse the repository at this point in the history
  • Loading branch information
nfrerebeau committed Apr 8, 2024
1 parent 67ac3b9 commit 09be2cd
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 30 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: gamma
Title: Dose Rate Estimation from in-Situ Gamma-Ray Spectrometry
Measurements
Version: 1.0.4.9000
Version: 1.0.5
Authors@R: c(
person("Nicolas", "Frerebeau", , "nicolas.frerebeau@u-bordeaux-montaigne.fr", role = "aut",
comment = c(ORCID = "0000-0001-5759-4944")),
Expand Down Expand Up @@ -52,7 +52,7 @@ Config/testthat/edition: 3
Encoding: UTF-8
LazyData: false
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Collate:
'AllClasses.R'
'AllGenerics.R'
Expand Down
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# gamma 1.0.4.9000
# gamma 1.0.5
## Internals
* Fix unicode character in plot axis labels.

# gamma 1.0.4
## Bugfixes & changes
Expand Down
2 changes: 1 addition & 1 deletion R/gamma-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#' \tabular{ll}{
#' **Package:** \tab gamma \cr
#' **Type:** \tab Package \cr
#' **Version:** \tab 1.0.4 \cr
#' **Version:** \tab 1.0.5 \cr
#' **License:** \tab GPL-3 \cr
#' **Zenodo:** \tab \doi{10.5281/zenodo.2652393}
#' }
Expand Down
4 changes: 2 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ knitr::opts_chunk$set(
# gamma <img width=120px src="man/figures/logo.png" align="right" />

<!-- badges: start -->
[![R-CMD-check](https://github.com/crp2a/gamma/workflows/R-CMD-check/badge.svg)](https://github.com/crp2a/gamma/actions)
[![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)
[![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}
[![CRAN Version](http://www.r-pkg.org/badges/version/gamma)](https://cran.r-project.org/package=gamma){.pkgdown-release}
[![CRAN checks](https://badges.cranchecks.info/worst/gamma.svg)](https://cran.r-project.org/web/checks/check_results_gamma.html){.pkgdown-release}
[![CRAN Downloads](http://cranlogs.r-pkg.org/badges/gamma)](https://cran.r-project.org/package=gamma){.pkgdown-release}

[![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)

[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2652393.svg)](https://doi.org/10.5281/zenodo.2652393)
[![SWH](https://archive.softwareheritage.org/badge/swh:1:dir:459ecf47c4c0bb768732bd56c5c245ddab0d33f9/)](https://archive.softwareheritage.org/swh:1:dir:459ecf47c4c0bb768732bd56c5c245ddab0d33f9;origin=https://github.com/crp2a/gamma;visit=swh:1:snp:10e6be6e5cbe735b58c45abbcbabf20b93019e9c;anchor=swh:1:rev:1b3baf8821267ed656d780ae154d347769141d0c/)

<!-- badges: end -->

## Overview
Expand Down
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<!-- badges: start -->

[![R-CMD-check](https://github.com/crp2a/gamma/workflows/R-CMD-check/badge.svg)](https://github.com/crp2a/gamma/actions)
[![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)
[![codecov](https://codecov.io/gh/crp2a/gamma/branch/master/graph/badge.svg)](https://app.codecov.io/gh/crp2a/gamma)

<a href="https://crp2a.r-universe.dev" class="pkgdown-devel"><img
Expand All @@ -14,10 +14,6 @@ src="https://crp2a.r-universe.dev/badges/gamma" alt="r-universe" /></a>
class="pkgdown-release"><img
src="http://www.r-pkg.org/badges/version/gamma"
alt="CRAN Version" /></a>
<a href="https://cran.r-project.org/web/checks/check_results_gamma.html"
class="pkgdown-release"><img
src="https://badges.cranchecks.info/worst/gamma.svg"
alt="CRAN checks" /></a>
<a href="https://cran.r-project.org/package=gamma"
class="pkgdown-release"><img
src="http://cranlogs.r-pkg.org/badges/gamma" alt="CRAN Downloads" /></a>
Expand All @@ -28,6 +24,7 @@ developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.re

[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2652393.svg)](https://doi.org/10.5281/zenodo.2652393)
[![SWH](https://archive.softwareheritage.org/badge/swh:1:dir:459ecf47c4c0bb768732bd56c5c245ddab0d33f9/)](https://archive.softwareheritage.org/swh:1:dir:459ecf47c4c0bb768732bd56c5c245ddab0d33f9;origin=https://github.com/crp2a/gamma;visit=swh:1:snp:10e6be6e5cbe735b58c45abbcbabf20b93019e9c;anchor=swh:1:rev:1b3baf8821267ed656d780ae154d347769141d0c/)

<!-- badges: end -->

## Overview
Expand All @@ -50,10 +47,10 @@ of **gamma**.
Estimation from In-Situ Gamma-Ray Spectrometry Measurements."
_Ancient TL_, *38*(2), 1-5.

Frerebeau N, Lebrun B, Paradol G (2023). _gamma: Dose Rate Estimation
Frerebeau N, Lebrun B, Paradol G (2024). _gamma: Dose Rate Estimation
from in-Situ Gamma-Ray Spectrometry_. Université Bordeaux Montaigne,
Pessac, France. doi:10.5281/zenodo.2652393
<https://doi.org/10.5281/zenodo.2652393>, R package version 1.0.4.
<https://doi.org/10.5281/zenodo.2652393>, R package version 1.0.5.

## Installation

Expand Down
21 changes: 8 additions & 13 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,17 @@
"identifier": "gamma",
"description": "Process in-situ Gamma-Ray Spectrometry for Luminescence Dating. This package allows to import, inspect and correct the energy shifts of Gamma-ray spectra. It provides methods for estimating the gamma dose rate by the use of a calibration curve as described in Mercier and Falguères (2007). The package only supports Canberra CNF and TKA files.",
"name": "gamma: Dose Rate Estimation from in-Situ Gamma-Ray Spectrometry\n Measurements",
"relatedLink": ["https://crp2a.github.io/gamma/", "https://CRAN.R-project.org/package=gamma"],
"relatedLink": "https://crp2a.github.io/gamma/",
"codeRepository": "https://github.com/crp2a/gamma",
"issueTracker": "https://github.com/crp2a/gamma/issues",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "1.0.4.9000",
"version": "1.0.5",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
"url": "https://r-project.org"
},
"runtimePlatform": "R version 4.3.0 (2023-04-21)",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
"name": "Comprehensive R Archive Network (CRAN)",
"url": "https://cran.r-project.org"
},
"runtimePlatform": "R version 4.3.3 (2024-02-29)",
"author": [
{
"@type": "Person",
Expand Down Expand Up @@ -237,7 +231,7 @@
},
"SystemRequirements": null
},
"fileSize": "3983.471KB",
"fileSize": "4055.625KB",
"citation": [
{
"@type": "ScholarlyArticle",
Expand Down Expand Up @@ -299,7 +293,7 @@
},
{
"@type": "SoftwareSourceCode",
"datePublished": "2023",
"datePublished": "2024",
"author": [
{
"@type": "Person",
Expand All @@ -319,13 +313,14 @@
],
"name": "{gamma: Dose Rate Estimation from in-Situ Gamma-Ray Spectrometry}",
"identifier": "10.5281/zenodo.2652393",
"description": "R package version 1.0.4.9000",
"description": "R package version 1.0.5",
"@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", "https://app.codecov.io/gh/crp2a/gamma"],
"contIntegration": ["https://github.com/crp2a/gamma/actions/workflows/R-CMD-check.yaml", "https://app.codecov.io/gh/crp2a/gamma"],
"developmentStatus": "https://www.repostatus.org/#active",
"keywords": ["luminescence-dating", "geochronology", "archaeology", "r-package", "gamma-spectrometry"]
}
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Test environments

* Local R installation: R 4.3.0
* Local R installation: R 4.3.3
* 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
Expand Down
4 changes: 3 additions & 1 deletion inst/CITATION
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
citHeader("To cite gamma in publications use:")
bibentry(
bibtype = "Article",
key = "lebrun2020",
author = c(person("Brice", "Lebrun", role = "aut"),
person("Nicolas", "Frerebeau", role = "aut"),
person("Guilhem", "Paradol", role = "aut"),
Expand All @@ -18,11 +19,12 @@ bibentry(
)
bibentry(
bibtype = "Manual",
key = "R-gamma",
author = c(person("Nicolas", "Frerebeau", role = "aut"),
person("Brice", "Lebrun", role = "aut"),
person("Guilhem", "Paradol", role = "aut")),
title = "{gamma: Dose Rate Estimation from in-Situ Gamma-Ray Spectrometry}",
year = "2023",
year = "2024",
organization = "Université Bordeaux Montaigne",
address = "Pessac, France",
note = sprintf("R package version %s", meta$Version),
Expand Down
Binary file modified man/figures/README-calib-1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions man/gamma-package.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 09be2cd

Please sign in to comment.