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 Mar 10, 2022
1 parent c553451 commit 6c08e8f
Show file tree
Hide file tree
Showing 9 changed files with 292 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ If you want to make a bigger change, it's a good idea to first file an issue and
* Install all development dependencies with `devtools::install_dev_deps()`, and then make sure the package passes R CMD check by running `devtools::check()`. If R CMD check doesn't pass cleanly, it's a good idea to ask for help before continuing.
* Create a Git branch for your pull request (PR). We recommend using `usethis::pr_init("brief-description-of-change")`.
* Make your changes, commit to git, and then create a PR by running `usethis::pr_push()`, and following the prompts in your browser. The title of your PR should briefly describe the change. The body of your PR should contain `Fixes #issue-number`.
* For user-facing changes, add a bullet to the top of `NEWS.md` (i.e. just below the first header). Follow the style described in <https://documentation.tesselle.org>.
* For user-facing changes, add a bullet to the top of `NEWS.md` (i.e. just below the first header). Follow the style described in <https://www.tesselle.org/style.html>.

### Code style

* New code should follow the [style guide](https://documentation.tesselle.org).
* New code should follow the [style guide](https://www.tesselle.org/style.html).
* We use [roxygen2](https://cran.r-project.org/package=roxygen2), with [Markdown syntax](https://cran.r-project.org/web/packages/roxygen2/vignettes/rd-formatting.html), for documentation.
* We use [testthat](https://cran.r-project.org/package=testthat) for unit tests. Contributions with test cases included are easier to accept.

Expand Down
259 changes: 255 additions & 4 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# -----------------------------------------------------------
# CITATION file created with {cffr} R package, v0.1.0
# CITATION file created with {cffr} R package, v0.2.1
# See also: https://docs.ropensci.org/cffr/
# -----------------------------------------------------------

Expand All @@ -8,7 +8,7 @@ message: 'To cite package "kairos" in publications use:'
type: software
license: GPL-3.0-or-later
title: 'kairos: Analysis of Chronological Patterns from Archaeological Count Data'
version: 1.0.0.9000
version: 1.0.1
abstract: A toolkit for absolute dating and analysis of chronological patterns. This
package includes functions for chronological modeling and dating of archaeological
assemblages from count data. It allows to compute time point estimates and density
Expand All @@ -28,7 +28,7 @@ preferred-citation:
email: [email protected]
orcid: https://orcid.org/0000-0001-5759-4944
affiliation: Université Bordeaux Montaigne
version: 1.0.0.9000
version: 1.0.1
abstract: A toolkit for absolute dating and analysis of chronological patterns.
This package includes functions for chronological modeling and dating of archaeological
assemblages from count data. It allows to compute time point estimates and density
Expand All @@ -41,8 +41,13 @@ preferred-citation:
email: [email protected]
orcid: https://orcid.org/0000-0001-5759-4944
affiliation: Université Bordeaux Montaigne
keywords:
- archaeological-science
- archaeology
- chronology
- r-package
license: GPL-3.0-or-later
year: '2021'
year: '2022'
repository-code: https://github.com/tesselle/kairos
url: https://packages.tesselle.org/kairos/
contact:
Expand All @@ -56,6 +61,252 @@ keywords:
- archaeology
- archaeological science
- r package
references:
- type: software
title: 'R: A Language and Environment for Statistical Computing'
notes: Depends
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2022'
url: https://www.R-project.org/
institution:
name: R Foundation for Statistical Computing
version: '>= 3.4'
- type: software
title: arkhe
abstract: 'arkhe: Representation of Archaeological Data'
notes: Imports
authors:
- family-names: Frerebeau
given-names: Nicolas
email: [email protected]
orcid: https://orcid.org/0000-0001-5759-4944
year: '2022'
url: https://CRAN.R-project.org/package=arkhe
version: '>= 0.4.0'
- type: software
title: dimensio
abstract: 'dimensio: Multivariate Data Analysis'
notes: Imports
authors:
- family-names: Frerebeau
given-names: Nicolas
email: [email protected]
orcid: https://orcid.org/0000-0001-5759-4944
year: '2022'
url: https://CRAN.R-project.org/package=dimensio
version: '>= 0.2.2'
- type: software
title: extraDistr
abstract: 'extraDistr: Additional Univariate and Multivariate Distributions'
notes: Imports
authors:
- family-names: Wolodzko
given-names: Tymoteusz
year: '2022'
url: https://CRAN.R-project.org/package=extraDistr
- type: software
title: ggplot2
abstract: 'ggplot2: Create Elegant Data Visualisations Using the Grammar of Graphics'
notes: Imports
authors:
- family-names: Wickham
given-names: Hadley
email: [email protected]
orcid: https://orcid.org/0000-0003-4757-117X
- family-names: Chang
given-names: Winston
orcid: https://orcid.org/0000-0002-1576-2126
- family-names: Henry
given-names: Lionel
- family-names: Pedersen
given-names: Thomas Lin
email: [email protected]
orcid: https://orcid.org/0000-0002-5147-4711
- family-names: Takahashi
given-names: Kohske
- family-names: Wilke
given-names: Claus
orcid: https://orcid.org/0000-0002-7470-9261
- family-names: Woo
given-names: Kara
orcid: https://orcid.org/0000-0002-5125-4188
- family-names: Yutani
given-names: Hiroaki
orcid: https://orcid.org/0000-0002-3385-7233
- family-names: Dunnington
given-names: Dewey
orcid: https://orcid.org/0000-0002-9415-4582
year: '2022'
url: https://CRAN.R-project.org/package=ggplot2
- type: software
title: Hmisc
abstract: 'Hmisc: Harrell Miscellaneous'
notes: Imports
authors:
- family-names: Harrell Jr
given-names: Frank E
email: [email protected]
orcid: https://orcid.org/0000-0002-8271-5493
year: '2022'
url: https://CRAN.R-project.org/package=Hmisc
- type: software
title: methods
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2022'
url: https://www.R-project.org/
institution:
name: R Foundation for Statistical Computing
- type: software
title: rlang
abstract: 'rlang: Functions for Base Types and Core R and ''Tidyverse'' Features'
notes: Imports
authors:
- family-names: Henry
given-names: Lionel
email: [email protected]
- family-names: Wickham
given-names: Hadley
email: [email protected]
year: '2022'
url: https://CRAN.R-project.org/package=rlang
- type: software
title: stats
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2022'
url: https://www.R-project.org/
institution:
name: R Foundation for Statistical Computing
- type: software
title: utils
abstract: 'R: A Language and Environment for Statistical Computing'
notes: Imports
authors:
- name: R Core Team
location:
name: Vienna, Austria
year: '2022'
url: https://www.R-project.org/
institution:
name: R Foundation for Statistical Computing
- type: software
title: covr
abstract: 'covr: Test Coverage for Packages'
notes: Suggests
authors:
- family-names: Hester
given-names: Jim
email: [email protected]
year: '2022'
url: https://CRAN.R-project.org/package=covr
- type: software
title: folio
abstract: 'folio: Datasets for Teaching Archaeology and Paleontology'
notes: Suggests
authors:
- family-names: Frerebeau
given-names: Nicolas
email: [email protected]
orcid: https://orcid.org/0000-0001-5759-4944
year: '2022'
url: https://CRAN.R-project.org/package=folio
- type: software
title: knitr
abstract: 'knitr: A General-Purpose Package for Dynamic Report Generation in R'
notes: Suggests
authors:
- family-names: Xie
given-names: Yihui
email: [email protected]
orcid: https://orcid.org/0000-0003-0645-5666
year: '2022'
url: https://CRAN.R-project.org/package=knitr
- type: software
title: rmarkdown
abstract: 'rmarkdown: Dynamic Documents for R'
notes: Suggests
authors:
- family-names: Allaire
given-names: JJ
email: [email protected]
- family-names: Xie
given-names: Yihui
email: [email protected]
orcid: https://orcid.org/0000-0003-0645-5666
- family-names: McPherson
given-names: Jonathan
email: [email protected]
- family-names: Luraschi
given-names: Javier
email: [email protected]
- family-names: Ushey
given-names: Kevin
email: [email protected]
- family-names: Atkins
given-names: Aron
email: [email protected]
- family-names: Wickham
given-names: Hadley
email: [email protected]
- family-names: Cheng
given-names: Joe
email: [email protected]
- family-names: Chang
given-names: Winston
email: [email protected]
- family-names: Iannone
given-names: Richard
email: [email protected]
orcid: https://orcid.org/0000-0003-3925-190X
year: '2022'
url: https://CRAN.R-project.org/package=rmarkdown
- type: software
title: testthat
abstract: 'testthat: Unit Testing for R'
notes: Suggests
authors:
- family-names: Wickham
given-names: Hadley
email: [email protected]
year: '2022'
url: https://CRAN.R-project.org/package=testthat
version: '>= 3.0.0'
- type: software
title: vdiffr
abstract: 'vdiffr: Visual Regression Testing and Graphical Diffing'
notes: Suggests
authors:
- family-names: Henry
given-names: Lionel
email: [email protected]
- family-names: Pedersen
given-names: Thomas Lin
email: [email protected]
orcid: https://orcid.org/0000-0002-5147-4711
- family-names: Luciani
given-names: T Jake
email: [email protected]
- family-names: Decorde
given-names: Matthieu
email: [email protected]
- family-names: Lise
given-names: Vaudor
email: [email protected]
year: '2022'
url: https://CRAN.R-project.org/package=vdiffr
version: '>= 1.0.0'
identifiers:
- description: The concept DOI.
type: doi
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: kairos
Title: Analysis of Chronological Patterns from Archaeological Count Data
Version: 1.0.0.9000
Version: 1.0.1
Authors@R:
c(person(given = "Nicolas",
family = "Frerebeau",
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# kairos 1.0.0.9000
# kairos 1.0.1

## Bugfixes & changes
* Fix aoristic sum calculation (#1). `aoristic()` now calculates weights within the time blocks rather than at the break dates between blocks.

Expand Down
2 changes: 1 addition & 1 deletion R/kairos-package.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#' \tabular{ll}{
#' **Package:** \tab kairos \cr
#' **Type:** \tab Package \cr
#' **Version:** \tab 1.0.0 \cr
#' **Version:** \tab 1.0.1 \cr
#' **License:** \tab GPL-3 \cr
#' }
#'
Expand Down
Loading

0 comments on commit 6c08e8f

Please sign in to comment.