Skip to content

Commit

Permalink
Merge tag '0.9.2' into develop
Browse files Browse the repository at this point in the history
Updates some documentation and minor code changes.
  • Loading branch information
kloppen committed Sep 10, 2023
2 parents 94d2935 + 6955a09 commit 27e4ad1
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 19 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ GenerateFakeData.R
^rebuild-long-running-vignette.R
^.Rprofile
^\.github$
^CRAN-SUBMISSION$
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.9.2
Date: 2023-09-09 02:52:49 UTC
SHA: 2c82ee36b581315d498052d05fa1fa119c0f76e9
7 changes: 4 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
Package: cmstatr
Type: Package
Title: Statistical Methods for Composite Material Data
Version: 0.9.1.9000
Date: 2021-09-30
Version: 0.9.2
Date: 2023-09-05
Depends: R (>= 3.3)
Authors@R: c(
person("Stefan", "Kloppenborg", email = "stefan@kloppenborg.ca",
comment = c(ORCID = "0000-0002-1908-5214"),
role = c("aut", "cre")),
person("Billy", "Cheng", email = "bcheng@comtekadvanced.com",
role = c("ctb")),
person("Ally", "Fraser", email = "ally.fraser25@gmail.com",
role = c("ctb")),
person("Jeffrey Borlik",
person("Jeffrey", "Borlik",
role = c("ctb")),
person("Comtek Advanced Structures, Ltd.",
role = c("fnd"))
Expand Down
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# Version 0.9.2
- Update to Anderson Darling k-Sample vignette to explain differences with
SciPy implementation
- Updated README
- Update `plot_nested` to use `linewidth` instead of `size` internally due
to update to `ggplot2`

# Version 0.9.1
- Updated tests to accommodate upcoming changes to the rlang package.
No change to test coverage was made.
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ knitr::opts_chunk$set(

<!-- badges: start -->
[![R-CMD-check](https://github.com/cmstatr/cmstatr/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/cmstatr/cmstatr/actions/workflows/R-CMD-check.yaml)
[![`Codecov` test coverage](https://codecov.io/gh/cmstatr/cmstatr/branch/master/graph/badge.svg)](https://codecov.io/gh/cmstatr/cmstatr?branch=master)
[![`Codecov` test coverage](https://codecov.io/gh/cmstatr/cmstatr/branch/master/graph/badge.svg)](https://app.codecov.io/gh/cmstatr/cmstatr?branch=master)
[![DOI](https://joss.theoj.org/papers/10.21105/joss.02265/status.svg)](https://doi.org/10.21105/joss.02265)
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/cmstatr)](https://cran.r-project.org/package=cmstatr)
[![](https://cranlogs.r-pkg.org/badges/cmstatr)](https://cran.r-project.org/package=cmstatr)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

[![R-CMD-check](https://github.com/cmstatr/cmstatr/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/cmstatr/cmstatr/actions/workflows/R-CMD-check.yaml)
[![`Codecov` test
coverage](https://codecov.io/gh/cmstatr/cmstatr/branch/master/graph/badge.svg)](https://codecov.io/gh/cmstatr/cmstatr?branch=master)
coverage](https://codecov.io/gh/cmstatr/cmstatr/branch/master/graph/badge.svg)](https://app.codecov.io/gh/cmstatr/cmstatr?branch=master)
[![DOI](https://joss.theoj.org/papers/10.21105/joss.02265/status.svg)](https://doi.org/10.21105/joss.02265)
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/cmstatr)](https://cran.r-project.org/package=cmstatr)
[![](https://cranlogs.r-pkg.org/badges/cmstatr)](https://cran.r-project.org/package=cmstatr)
Expand Down
21 changes: 12 additions & 9 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
This re-submission does not change functionality, but the test suite has
been updated to allow for an upcoming change to rlang when version 1.0.0
of that package is released.
This re-submission does not change functionality. It updates a vignette and the
README, as well as making some minor changes to the code to address lintr
failures.

## Test environments
- win-builder (devel, release, oldrelease)
- local Ubuntu 20.04, R 4.1.1
- win-builder (`devel`, `release`).
- local Ubuntu 20.04, R 4.3.1
- GitHub Action runners:
- Windows, R 4.1.1
- MacOS, R 4.1.1
- Ubuntu 20.04, R 4.1.1
- Ubuntu 18.04, R 4.0.5
- Windows, R `release`
- MacOS, R `release`
- Ubuntu latest, R `devel`
- Ubuntu latest, R `release` (note that `vdiffr` had to be pinned to v1.0.5 to
prevent the runner from exceeding the resource limitations while building
`vdiffr`. This is not an issue with the `cmstatr` package.)
- Ubuntu latest, R `oldrel`

## R CMD check results
There were no ERRORs, WARNINGs, or NOTEs.
Expand Down
6 changes: 2 additions & 4 deletions inst/CITATION
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
citHeader("To cite ‘cmstatr’ in publications use:")

citEntry(
bibentry(
"Article",
title = "cmstatr: An {R} Package for Statistical Analysis of Composite Material Data",
author = personList(as.person("Stefan Kloppenborg")),
author = "Stefan Kloppenborg",
year = 2020,
journal = "Journal of Open Source Software",
volume = 5,
Expand Down
3 changes: 3 additions & 0 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ akN
al
Borlik
CMH
CMD
Comtek
CPT
csl
Expand Down Expand Up @@ -37,8 +38,10 @@ lm
Marsaglia
MNR
normed
ORCID
OSL
prepreg
README
rlang
RTD
SAE
Expand Down
2 changes: 1 addition & 1 deletion man/cmstatr-package.Rd

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

0 comments on commit 27e4ad1

Please sign in to comment.