Skip to content

Commit a828727

Browse files
authored
Merge pull request #108 from ropensci/fix_readr
adjust readr and workflow cache version
2 parents ec9bfd5 + 40fad11 commit a828727

7 files changed

Lines changed: 20 additions & 12 deletions

File tree

.github/workflows/PKGDOWN.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
shell: Rscript {0}
2727

2828
- name: Cache R packages
29-
uses: actions/cache@v2
29+
uses: actions/cache@v3
3030
with:
3131
path: ${{ env.R_LIBS_USER }}
3232
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

.github/workflows/R-CMD-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
config:
3131
- {os: macOS-latest, r: 'release'}
3232
- {os: windows-latest, r: 'release'}
33-
- {os: ubuntu-latest, r: 'release'}
33+
- {os: ubuntu-22.04, r: 'release'}
3434
# - {os: windows-latest, r: '3.6'}
3535
# - {os: ubuntu-16.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest", http-user-agent: "R/4.0.0 (ubuntu-16.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
3636
# - {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"}
@@ -96,7 +96,7 @@ jobs:
9696

9797
- name: Cache R packages
9898
if: runner.os != 'Windows'
99-
uses: actions/cache@v2
99+
uses: actions/cache@v3
100100
with:
101101
path: ${{ env.R_LIBS_USER }}
102102
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: nlrx
22
Type: Package
33
Title: Setup, Run and Analyze 'NetLogo' Model Simulations from 'R' via 'XML'
4-
Version: 0.4.5
4+
Version: 0.4.6
55
Authors@R: c(person("Jan", "Salecker", email = "jan.salecker@posteo.de",
66
role = c("aut"), comment = c(ORCID = '0000-0002-9000-4229')),
77
person("Marco", "Sciaini", email = "sciaini.marco@gmail.com",
@@ -22,7 +22,7 @@ License: GPL-3
2222
Encoding: UTF-8
2323
LazyData: true
2424
Roxygen: list(markdown = TRUE)
25-
RoxygenNote: 7.2.3
25+
RoxygenNote: 7.3.3
2626
URL: https://docs.ropensci.org/nlrx/, https://github.com/ropensci/nlrx/
2727
BugReports: https://github.com/ropensci/nlrx/issues/
2828
Imports:

NEWS.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
# nlrx 0.4.6
3+
4+
## Functionality
5+
6+
* Updated readr::file_write function to avoid pkg break due to deprecation
7+
* added support to download_netLogo() for up to NetLogo version 6.4.0
8+
29
# nlrx 0.4.5
310

411
## Functionality

R/download_netlogo.R

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ supported_netlogo_versions <- function() {
2626
"6.2.0",
2727
"6.2.1",
2828
"6.2.2",
29-
"6.3.0"
29+
"6.3.0",
30+
"6.4.0"
3031
)
3132
return(supported_versions)
3233
}

R/write_simoutput.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ setsim(nl, \"simoutput\") <- results")
5252
".csv"))
5353

5454
# Write output
55-
readr::write_csv(x = getsim(nl, "simoutput"), path = outfilename)
55+
readr::write_csv(x = getsim(nl, "simoutput"), file = outfilename)
5656
}
5757

cran-comments.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,20 @@
22

33
This is a resubmission. In this version I have:
44

5-
* Fixed a typo in the package documentation to resolve CRAN check Notes
5+
* Updated readr::file_write function to avoid pkg break due to deprecation
66

77

88
# Original (Re-) Submission
99

10-
nlrx version 0.4.5
10+
nlrx version 0.4.6
1111

1212
## CRAN check error fixes
1313

14-
* Fixed a typo in the package documentation (nldoc_write_nldoc)
14+
* None
1515

16-
## Changes in version 0.4.5
16+
## Changes in version 0.4.6
1717

18-
* None
18+
* Updated readr::file_write function to avoid pkg break due to deprecation
1919

2020
## R CMD check results
2121

0 commit comments

Comments
 (0)