diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 271d466..a3ac618 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -1,4 +1,4 @@ -# Workflow derived from https://github.com/r-lib/actions/tree/master/examples +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: config: - - {os: macOS-latest, r: 'release'} + - {os: macos-latest, r: 'release'} - {os: windows-latest, r: 'release'} - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} - {os: ubuntu-latest, r: 'release'} @@ -29,18 +29,21 @@ jobs: R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - - uses: r-lib/actions/setup-pandoc@v1 + - uses: r-lib/actions/setup-pandoc@v2 - - uses: r-lib/actions/setup-r@v1 + - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true - - uses: r-lib/actions/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: rcmdcheck + extra-packages: any::rcmdcheck + needs: check - - uses: r-lib/actions/check-r-package@v1 + - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true diff --git a/DESCRIPTION b/DESCRIPTION index 10be66b..d3e41d9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,9 +1,9 @@ Package: EloOptimized Title: Optimized Elo Rating Method for Obtaining Dominance Ranks Version: 0.3.1.9000 -Date: 2021-12-18 +Date: 2023-05-08 Authors@R: c( - person("Joseph", "Feldblum", email = "feldblum@umich.edu", role = c("aut", "cre")), + person("Joseph", "Feldblum", email = "jtf9@duke.edu", role = c("aut", "cre")), person("Steffen", "Foerster", email = "sf2041@gmail.com", role = c("aut")), person("Mathias", "Franz", email = "m.franz@izw-berlin.de", role = c("aut"))) Description: Provides an implementation of the maximum likelihood methods for deriving @@ -13,7 +13,7 @@ Depends: License: GPL-3 Encoding: UTF-8 LazyData: true -RoxygenNote: 7.1.1 +RoxygenNote: 7.2.3 Imports: dplyr, reshape2, BAMMtools, diff --git a/NEWS.md b/NEWS.md index d5193f9..49c27a5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,7 +2,7 @@ * Added a step to check that agon_data are in chronological order, and throw a warning if not. -* removed ubuntu checks (tried "- {os: ubuntu-latest, r: 'release'}" and "- {os: ubuntu-18.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}", and various other combinations, none of them worked, I'll have to figure out how to make this work again I guess before submitting next version to CRAN) +* Fixed checks for ubuntu and Mac * Added new and improved informative errors to eloratingopt() that tell you which individuals are filtered out for not having >= 1 win and 1 loss, and which individuals have interactions outside of their presence window. diff --git a/README.Rmd b/README.Rmd index 7260b91..8ddd443 100644 --- a/README.Rmd +++ b/README.Rmd @@ -20,8 +20,7 @@ library(EloOptimized) - [![Travis-CI Build Status](https://travis-ci.org/jtfeld/EloOptimized.svg?branch=master)](https://travis-ci.org/jtfeld/EloOptimized) -[![R-CMD-check](https://github.com/jtfeld/EloOptimized/workflows/R-CMD-check/badge.svg)](https://github.com/jtfeld/EloOptimized/actions) + [![R-CMD-check](https://github.com/jtfeld/EloOptimized/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/jtfeld/EloOptimized/actions/workflows/R-CMD-check.yaml) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/EloOptimized)](https://cran.r-project.org/package=EloOptimized) [![](https://cranlogs.r-pkg.org/badges/grand-total/EloOptimized)](https://cran.r-project.org/package=EloOptimized) diff --git a/README.md b/README.md index b2c4eb2..781e5e2 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,7 @@ -[![Travis-CI Build -Status](https://travis-ci.org/jtfeld/EloOptimized.svg?branch=master)](https://travis-ci.org/jtfeld/EloOptimized) -[![R-CMD-check](https://github.com/jtfeld/EloOptimized/workflows/R-CMD-check/badge.svg)](https://github.com/jtfeld/EloOptimized/actions) +[![R-CMD-check](https://github.com/jtfeld/EloOptimized/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/jtfeld/EloOptimized/actions/workflows/R-CMD-check.yaml) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/EloOptimized)](https://cran.r-project.org/package=EloOptimized) [![](https://cranlogs.r-pkg.org/badges/grand-total/EloOptimized)](https://cran.r-project.org/package=EloOptimized)