Skip to content

Commit

Permalink
Merge branch 'release/3.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
adamblake committed Feb 9, 2024
2 parents 1e53e5e + 9fb29f1 commit e25c2eb
Show file tree
Hide file tree
Showing 52 changed files with 1,066 additions and 1,102 deletions.
1 change: 0 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
^.*\.Rproj$
^\.Rproj\.user$
^scripts$
cache_test_data
^README\.Rmd$
^cran-comments\.md$
^CRAN-RELEASE$
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# https://github.com/r-lib/actions/tree/v2/setup-pandoc
- uses: r-lib/actions/setup-pandoc@v2
Expand All @@ -51,7 +51,7 @@ jobs:
# https://github.com/r-lib/actions/tree/v2/setup-r-dependencies
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
extra-packages: any::rcmdcheck, lme4?source, UCLATALL/JMRData
needs: check

# https://github.com/r-lib/actions/tree/v2/check-r-package
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
# https://github.com/actions/checkout
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# https://github.com/r-lib/actions/tree/v2/setup-r
- uses: r-lib/actions/setup-r@v2
Expand All @@ -24,7 +24,7 @@ jobs:
# https://github.com/r-lib/actions/tree/v2/setup-r-dependencies
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr
extra-packages: any::covr, lme4?source, UCLATALL/JMRData
needs: coverage

- name: Test coverage
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
.Ruserdata
.Rapp.history

# CRAN
CRAN-SUBMISSION

# Mac file
.DS_Store
5 changes: 3 additions & 2 deletions .lintr
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
linters: linters_with_defaults(
line_length_linter(100),
line_length_linter(100),
commented_code_linter = NULL,
object_usage_linter = NULL
object_usage_linter = NULL,
T_and_F_symbol_linter = NULL
)
exclusions: list(
"DESCRIPTION",
Expand Down
19 changes: 10 additions & 9 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Type: Package
Package: supernova
Title: Judd, McClelland, & Ryan Formatting for ANOVA Output
Version: 2.5.8
Date: 2023-11-03
Version: 3.0.0
Date: 2024-02-06
Authors@R: c(
person("Adam", "Blake", , "adamblake@g.ucla.edu", role = c("cre", "aut"),
person("Adam", "Blake", , "adam@coursekata.org", role = c("cre", "aut"),
comment = c(ORCID = "0000-0001-7881-8652")),
person("Jeff", "Chrabaszcz", role = "aut"),
person("Ji", "Son", , "json2@calstatela.edu", role = "aut",
Expand All @@ -16,17 +16,13 @@ Description: Produces ANOVA tables in the format used by Judd, McClelland,
and Ryan (2017, ISBN: 978-1138819832) in their introductory textbook,
Data Analysis. This includes proportional reduction in error and
formatting to improve ease the transition between the book and R.
License: AGPL (>= 3)
License: GPL (>= 3)
URL: https://github.com/UCLATALL/supernova
BugReports: https://github.com/UCLATALL/supernova/issues
Depends:
R (>= 3.4.0)
Imports:
backports,
cli,
ggplot2,
lifecycle,
magrittr,
methods,
pillar (>= 1.5.0),
purrr,
Expand All @@ -37,13 +33,18 @@ Imports:
Suggests:
car,
covr,
dplyr (>= 1.0.0),
ggplot2,
lintr,
lme4,
magrittr,
readr,
remotes,
testthat (>= 2.1.0),
tidyr,
vdiffr
Config/testthat/edition: 3
Encoding: UTF-8
LazyData: yes
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Loading

0 comments on commit e25c2eb

Please sign in to comment.