Prepare for next release

tesselle · Oct 4, 2024 · b12f73a · b12f73a
1 parent 73cae59
commit b12f73a
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 52 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -8,7 +8,7 @@ message: 'To cite package "aion" in publications use:'
 type: software
 license: GPL-3.0-or-later
 title: 'aion: Archaeological Time Series'
-version: 1.0.4
+version: 1.1.0
 doi: 10.21105/joss.06210
 identifiers:
 - description: The concept DOI.
@@ -29,25 +29,26 @@ identifiers:
 - description: The versioned DOI for version 1.0.4.
   type: doi
   value: 10.5281/zenodo.12951290
+- description: The CRAN DOI
+  type: doi
+  value: 10.32614/cran.package.aion
 - description: The Software Heritage identifier for version 1.0.2.
   type: swh
   value: swh:1:rel:10b21ffbf3914a6a084766e8f704388582408a6e
-abstract: A toolkit for archaeological time series. This package provides a system
-  of classes and methods to represent and work with archaeological time series. Dates
-  are represented as "rata die" and can be converted to (virtually) any calendar defined
-  by Reingold and Dershowitz (2018) <https://doi.org/10.1017/9781107415058>. This
-  packages offers a simple API that can be used by other specialized packages.
+abstract: A toolkit for archaeological time series and time intervals. This package
+  provides a system of classes and methods to represent and work with archaeological
+  time series and time intervals. Dates are represented as "rata die" and can be converted
+  to (virtually) any calendar defined by Reingold and Dershowitz (2018) <https://doi.org/10.1017/9781107415058>.
+  This packages offers a simple API that can be used by other specialized packages.
 authors:
 - family-names: Frerebeau
   given-names: Nicolas
   email: [email protected]
   orcid: https://orcid.org/0000-0001-5759-4944
-  affiliation: Université Bordeaux Montaigne
 - family-names: Roe
   given-names: Joe
   email: [email protected]
   orcid: https://orcid.org/0000-0002-1011-1244
-  affiliation: Universität Bern
 preferred-citation:
   type: article
   title: 'aion: An R Package to Represent Archaeological Time Series'
@@ -56,7 +57,6 @@ preferred-citation:
     given-names: Nicolas
     email: [email protected]
     orcid: https://orcid.org/0000-0001-5759-4944
-    affiliation: Université Bordeaux Montaigne
   year: '2024'
   journal: Journal of Open Source Software
   volume: '9'
@@ -70,7 +70,6 @@ contact:
   given-names: Nicolas
   email: [email protected]
   orcid: https://orcid.org/0000-0001-5759-4944
-  affiliation: Université Bordeaux Montaigne
 keywords:
 - time series
 - r package
@@ -89,7 +88,7 @@ references:
   institution:
     name: Université Bordeaux Montaigne
     address: Pessac, France
-  notes: R package version 1.0.4
+  notes: R package version 1.1.0
   url: https://packages.tesselle.org/aion/
   doi: 10.5281/zenodo.8032278
 - type: software
@@ -117,7 +116,7 @@ references:
     affiliation: Université Bordeaux Montaigne
   year: '2024'
   doi: 10.32614/CRAN.package.arkhe
-  version: '>= 1.6.0'
+  version: '>= 1.7.0'
 - type: software
   title: graphics
   abstract: 'R: A Language and Environment for Statistical Computing'
@@ -128,7 +127,6 @@ references:
     name: R Foundation for Statistical Computing
     address: Vienna, Austria
   year: '2024'
-  doi: 10.32614/CRAN.package.graphics
 - type: software
   title: grDevices
   abstract: 'R: A Language and Environment for Statistical Computing'
@@ -139,7 +137,6 @@ references:
     name: R Foundation for Statistical Computing
     address: Vienna, Austria
   year: '2024'
-  doi: 10.32614/CRAN.package.grDevices
 - type: software
   title: methods
   abstract: 'R: A Language and Environment for Statistical Computing'
@@ -150,7 +147,16 @@ references:
     name: R Foundation for Statistical Computing
     address: Vienna, Austria
   year: '2024'
-  doi: 10.32614/CRAN.package.methods
+- type: software
+  title: utils
+  abstract: 'R: A Language and Environment for Statistical Computing'
+  notes: Imports
+  authors:
+  - name: R Core Team
+  institution:
+    name: R Foundation for Statistical Computing
+    address: Vienna, Austria
+  year: '2024'
 - type: software
   title: folio
   abstract: 'folio: Datasets for Teaching Archaeology and Paleontology'

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,17 +1,16 @@
 Package: aion
 Title: Archaeological Time Series
-Version: 1.0.4.9000
+Version: 1.1.0
 Authors@R: c(
     person("Nicolas", "Frerebeau", , "[email protected]", role = c("aut", "cre"),
-           comment = c(ORCID = "0000-0001-5759-4944", affiliation = "Université Bordeaux Montaigne")),
+           comment = c(ORCID = "0000-0001-5759-4944")),
     person("Joe", "Roe", , "[email protected]", role = "aut",
-           comment = c(ORCID = "0000-0002-1011-1244", affiliation = "Universität Bern")),
+           comment = c(ORCID = "0000-0002-1011-1244")),
     person("Brice", "Lebrun", , "[email protected]", role = "ctb",
            comment = c(ORCID = "0000-0001-7503-8685", "Logo designer")),
     person("Université Bordeaux Montaigne", role = "fnd"),
     person("CNRS", role = "fnd")
   )
-Maintainer: Nicolas Frerebeau <[email protected]>
 Description: A toolkit for archaeological time series and time intervals.
     This package provides a system of classes and methods to represent and
     work with archaeological time series and time intervals. Dates are
@@ -25,10 +24,11 @@ BugReports: https://github.com/tesselle/aion/issues
 Depends: 
     R (>= 3.3)
 Imports: 
-    arkhe (>= 1.6.0),
+    arkhe (>= 1.7.0),
     graphics,
     grDevices,
-    methods
+    methods,
+    utils
 Suggests: 
     folio (>= 1.4.0),
     knitr,

diff --git a/NEWS.md b/NEWS.md
@@ -1,9 +1,9 @@
-# aion 1.0.4.9000
+# aion 1.1.0
 ## New classes and methods
 * Add support for time intervals.
 
 ## Bugfixes & changes
-* Fix a bug in `span()`: if a calendar was specified, the result was shifted according to the calendar epoch.
+* Fix a bug in `span()`: if a calendar was specified, the result was shifted according to the calendar's epoch (dates were returned instead of durations).
 
 # aion 1.0.4
 * Post publication CRAN release.

diff --git a/R/aion-package.R b/R/aion-package.R
@@ -2,7 +2,7 @@
 #'  \tabular{ll}{
 #'   **Package:** \tab aion \cr
 #'   **Type:** \tab Package \cr
-#'   **Version:** \tab 1.0.4 \cr
+#'   **Version:** \tab 1.1.0 \cr
 #'   **License:** \tab GPL-3 \cr
 #'   **Zenodo:** \tab \doi{10.5281/zenodo.8032278} \cr
 #'  }

diff --git a/README.Rmd b/README.Rmd
@@ -42,7 +42,7 @@ Base R ships with a lot of functionality useful for time series, in particular i
 
 Once a time series is created with **aion**, any calendar can be used for printing or plotting data (defaults to Gregorian Common Era; see `vignette("aion")`).
 
-**aion** does not provide tools for temporal modeling. Instead, it offers a simple API that can be used by other specialized packages.
+**aion** does not provide tools for temporal modeling. Instead, it offers a simple API that can be used by other specialized packages (see [**kairos**](https://packages.tesselle.org/kairos/) or [**ananke**](https://packages.tesselle.org/ananke/)).
 
 ---
 
@@ -89,7 +89,7 @@ mid <- rowMeans(loire[, c("lower", "upper")])
 X <- series(
   object = loire[, keep],
   time = mid,
-  calendar = calendar("AD")
+  calendar = AD()
 )
 
 ## Plot (default calendar)
@@ -107,7 +107,7 @@ Y <- intervals(
   start = loire$lower,
   end = loire$upper,
   names = rownames(loire),
-  calendar = calendar("AD")
+  calendar = AD()
 )
 
 ## Plot (default calendar)

diff --git a/README.md b/README.md
@@ -56,7 +56,9 @@ for printing or plotting data (defaults to Gregorian Common Era; see
 `vignette("aion")`).
 
 **aion** does not provide tools for temporal modeling. Instead, it
-offers a simple API that can be used by other specialized packages.
+offers a simple API that can be used by other specialized packages (see
+[**kairos**](https://packages.tesselle.org/kairos/) or
+[**ananke**](https://packages.tesselle.org/ananke/)).
 
 ------------------------------------------------------------------------
 
@@ -69,7 +71,7 @@ Series.” *Journal of Open Source Software*, *9*(96).
 Frerebeau N, Roe J (2024). *aion: Archaeological Time Series*.
 Université Bordeaux Montaigne, Pessac, France.
 <doi:10.5281/zenodo.8032278> <https://doi.org/10.5281/zenodo.8032278>, R
-package version 1.0.4.9000, <https://packages.tesselle.org/aion/>.
+package version 1.1.0, <https://packages.tesselle.org/aion/>.
 
 This package is a part of the tesselle project
 <https://www.tesselle.org>.
@@ -113,7 +115,7 @@ mid <- rowMeans(loire[, c("lower", "upper")])
 X <- series(
   object = loire[, keep],
   time = mid,
-  calendar = calendar("AD")
+  calendar = AD()
 )
 
 ## Plot (default calendar)
@@ -133,7 +135,7 @@ Y <- intervals(
   start = loire$lower,
   end = loire$upper,
   names = rownames(loire),
-  calendar = calendar("AD")
+  calendar = AD()
 )
 
 ## Plot (default calendar)

diff --git a/codemeta.json b/codemeta.json
@@ -2,13 +2,13 @@
   "@context": "https://doi.org/10.5063/schema/codemeta-2.0",
   "@type": "SoftwareSourceCode",
   "identifier": "aion",
-  "description": "A toolkit for archaeological time series. This package provides a system of classes and methods to represent and work with archaeological time series. Dates are represented as \"rata die\" and can be converted to (virtually) any calendar defined by Reingold and Dershowitz (2018) <doi:10.1017/9781107415058>. This packages offers a simple API that can be used by other specialized packages.",
+  "description": "A toolkit for archaeological time series and time intervals. This package provides a system of classes and methods to represent and work with archaeological time series and time intervals. Dates are represented as \"rata die\" and can be converted to (virtually) any calendar defined by Reingold and Dershowitz (2018) <doi:10.1017/9781107415058>. This packages offers a simple API that can be used by other specialized packages.",
   "name": "aion: Archaeological Time Series",
   "relatedLink": ["https://packages.tesselle.org/aion/", "https://CRAN.R-project.org/package=aion"],
   "codeRepository": "https://github.com/tesselle/aion",
   "issueTracker": "https://github.com/tesselle/aion/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
@@ -163,7 +163,7 @@
       "@type": "SoftwareApplication",
       "identifier": "arkhe",
       "name": "arkhe",
-      "version": ">= 1.6.0",
+      "version": ">= 1.7.0",
       "provider": {
         "@id": "https://cran.r-project.org",
         "@type": "Organization",
@@ -187,9 +187,14 @@
       "identifier": "methods",
       "name": "methods"
     },
+    "6": {
+      "@type": "SoftwareApplication",
+      "identifier": "utils",
+      "name": "utils"
+    },
     "SystemRequirements": null
   },
-  "fileSize": "441.308KB",
+  "fileSize": "495.986KB",
   "citation": [
     {
       "@type": "ScholarlyArticle",
@@ -234,7 +239,7 @@
       "name": "{aion: Archaeological Time Series}",
       "identifier": "10.5281/zenodo.8032278",
       "url": "https://packages.tesselle.org/aion/",
-      "description": "R package version 1.0.4",
+      "description": "R package version 1.1.0",
       "@id": "https://doi.org/10.5281/zenodo.8032278",
       "sameAs": "https://doi.org/10.5281/zenodo.8032278"
     }

diff --git a/man/aion-package.Rd b/man/aion-package.Rd
diff --git a/revdep/README.md b/revdep/README.md
@@ -1,25 +1,25 @@
 # Platform
 
-|field    |value                                                                                |
-|:--------|:------------------------------------------------------------------------------------|
-|version  |R version 4.4.1 (2024-06-14)                                                         |
-|os       |Ubuntu 22.04.4 LTS                                                                   |
-|system   |x86_64, linux-gnu                                                                    |
-|ui       |RStudio                                                                              |
-|language |(EN)                                                                                 |
-|collate  |fr_FR.UTF-8                                                                          |
-|ctype    |fr_FR.UTF-8                                                                          |
-|tz       |Europe/Paris                                                                         |
-|date     |2024-07-26                                                                           |
-|rstudio  |2024.04.2+764 Chocolate Cosmos (desktop)                                             |
-|pandoc   |3.1.11 @ /usr/lib/rstudio/resources/app/bin/quarto/bin/tools/x86_64/ (via rmarkdown) |
+|field    |value                                                                             |
+|:--------|:---------------------------------------------------------------------------------|
+|version  |R version 4.4.1 (2024-06-14)                                                      |
+|os       |Ubuntu 22.04.5 LTS                                                                |
+|system   |x86_64, linux-gnu                                                                 |
+|ui       |RStudio                                                                           |
+|language |(EN)                                                                              |
+|collate  |fr_FR.UTF-8                                                                       |
+|ctype    |fr_FR.UTF-8                                                                       |
+|tz       |Europe/Paris                                                                      |
+|date     |2024-10-04                                                                        |
+|rstudio  |2024.09.0+375 Cranberry Hibiscus (desktop)                                        |
+|pandoc   |3.2 @ /usr/lib/rstudio/resources/app/bin/quarto/bin/tools/x86_64/ (via rmarkdown) |
 
 # Dependencies
 
 |package |old   |new   |Δ  |
 |:-------|:-----|:-----|:--|
-|aion    |1.0.2 |1.0.4 |*  |
-|arkhe   |1.6.0 |1.6.0 |   |
+|aion    |1.0.4 |1.1.0 |*  |
+|arkhe   |1.7.0 |1.7.0 |   |
 
 # Revdeps