Skip to content

Commit

Permalink
Some changes (#341)
Browse files Browse the repository at this point in the history
* Remove empty file

* Fix unit test for R-devel

* Add GHA

* Better fix?

* Remove broken test
  • Loading branch information
jeroen authored Dec 9, 2020
1 parent 62ac44d commit 4f79eea
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 13 deletions.
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
78 changes: 78 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
on:
push:
pull_request:

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: windows-latest, r: 'release'}
- {os: macOS-latest, r: 'release'}
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}

env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2

- uses: r-lib/actions/setup-r@v1
with:
r-version: ${{ matrix.config.r }}

- uses: r-lib/actions/setup-pandoc@v1

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
shell: Rscript {0}

- name: Cache R packages
if: runner.os != 'Windows'
uses: actions/cache@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-

- name: Install system dependencies
if: runner.os == 'Linux'
run: |
while read -r cmd
do
eval sudo $cmd
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
- name: Install dependencies
run: |
remotes::install_deps(dependencies = TRUE)
remotes::install_cran("rcmdcheck")
shell: Rscript {0}

- name: Check
env:
_R_CHECK_CRAN_INCOMING_REMOTE_: false
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: jsonlite
Version: 1.7.1.9000
Version: 1.7.2
Title: A Simple and Robust JSON Parser and Generator for R
License: MIT + file LICENSE
Depends: methods
Expand Down
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
1.7.2
- Special case 'blob' vctrs to prevent boxing of base64 output strings
- Fix a unit test for new stricter all.equal() for environments in base-R

1.7.1
- Always rename the 'sf_column' column to 'geometry' in toJSON(sf = 'geojson') because
Expand Down
22 changes: 10 additions & 12 deletions tests/testthat/test-serializeJSON-functions.R
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
#test serializeJSON
#test serializeJSON

context("Serializing Functions")

# Note about numeric precision
# In the unit tests we use digits=10. Lowever values will result in problems for some datasets
test_that("Serializing Functions", {

options(keep.source=FALSE);

objects <- list(
function(x = 0) { x + 1 },
function(x) { x + 1 },
function(x, ...) { x + 1},
lm
);


)

#test all but list
lapply(objects, function(object){
expect_that(unserializeJSON(serializeJSON(object)), equals(object))
});

#test all in list
expect_that(unserializeJSON(serializeJSON(objects)), equals(objects))
});
fun <- unserializeJSON(serializeJSON(object))
environment(fun) <- environment(object)
expect_that(fun, equals(object))
})
})
Empty file removed tests/testthat/testS4.R
Empty file.

0 comments on commit 4f79eea

Please sign in to comment.