diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 98f1810f..7cb050da 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -32,7 +32,7 @@ jobs: _R_CHECK_DONTTEST_EXAMPLES_: FALSE _R_CHECK_CRAN_INCOMING_REMOTE_: false _R_CHECK_TESTS_NLINES_: 0 - neuprint_dataset: hemibrain:v1.0.1 + neuprint_dataset: hemibrain:v1.2.1 neuprint_server: https://neuprint.janelia.org neuprint_token: ${{ secrets.NEUPRINT_TOKEN }} R_KEEP_PKG_SOURCE: yes diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index f96cce34..4bc44f96 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -19,7 +19,7 @@ jobs: _R_CHECK_DONTTEST_EXAMPLES_: FALSE _R_CHECK_CRAN_INCOMING_REMOTE_: false _R_CHECK_TESTS_NLINES_: 0 - neuprint_dataset: hemibrain:v1.0.1 + neuprint_dataset: hemibrain:v1.2.1 neuprint_server: https://neuprint.janelia.org neuprint_token: ${{ secrets.NEUPRINT_TOKEN }} diff --git a/R/conn.R b/R/conn.R index 6f92d608..2d9b594b 100644 --- a/R/conn.R +++ b/R/conn.R @@ -94,7 +94,7 @@ #' server other than the one specified by the \code{neuprint_server} #' environment variable. #' -#' \preformatted{neuprint_dataset = "hemibrain:v1.0"} +#' \preformatted{neuprint_dataset = "hemibrain:v1.1"} #' #' @section Options: Although setting environment variables is the recommended #' approach, you can also set R startup options e.g. in your \code{.Rprofile} diff --git a/README.Rmd b/README.Rmd index cd52827b..665c163e 100644 --- a/README.Rmd +++ b/README.Rmd @@ -76,7 +76,7 @@ Make sure you have a blank line at the end of your `.Renviron` file. Note that you can optionally specify a default dataset: ```{r, eval=FALSE} -neuprint_dataset = "hemibrain:v1.0" +neuprint_dataset = "hemibrain:v1.1" ``` if your neuPrint server has more than one dataset. For further information diff --git a/README.md b/README.md index b961e0a8..bd3a8feb 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ Make sure you have a blank line at the end of your `.Renviron` file. Note that you can optionally specify a default dataset: ``` r -neuprint_dataset = "hemibrain:v1.0" +neuprint_dataset = "hemibrain:v1.1" ``` if your neuPrint server has more than one dataset. For further diff --git a/man/neuprint_login.Rd b/man/neuprint_login.Rd index bd143472..db9b2c4e 100644 --- a/man/neuprint_login.Rd +++ b/man/neuprint_login.Rd @@ -125,7 +125,7 @@ After successful login, the \code{neuprint_connection} object will server other than the one specified by the \code{neuprint_server} environment variable. - \preformatted{neuprint_dataset = "hemibrain:v1.0"} + \preformatted{neuprint_dataset = "hemibrain:v1.1"} } \section{Options}{ diff --git a/tests/testthat/test-conn.R b/tests/testthat/test-conn.R index fba436c0..98aef52f 100644 --- a/tests/testthat/test-conn.R +++ b/tests/testthat/test-conn.R @@ -18,7 +18,7 @@ test_that("neuprint_connection works", { skip_if_offline() expect_warning(expect_is( conn <- neuprint_login(server = "neuprint.janelia.org", - dataset = 'hemibrain:v1.0.1', + dataset = 'hemibrain:v1.2.1', Cache = F, Force = T), "neuprint_connection" ), diff --git a/tests/testthat/test-connectivity.R b/tests/testthat/test-connectivity.R index 87150982..1e08c64c 100644 --- a/tests/testthat/test-connectivity.R +++ b/tests/testthat/test-connectivity.R @@ -142,7 +142,7 @@ test_that("other connectivity functions work", { # check that results for one neuron are consistent with the same # neuron as part of a larger query c11.sel=c11[names(c1)] - c11.sel=c11.sel[!is.na(c11.sel$`2002436731_weight`),,drop=FALSE] + c11.sel=c11.sel[!is.na(c11.sel$`1734350788_weight`),,drop=FALSE] c11.sel=c11.sel[order(c11.sel$input),,drop=FALSE] c1=c1[order(c1$input),,drop=FALSE] expect_equal(c1, c11.sel) diff --git a/tests/testthat/test-cosine.R b/tests/testthat/test-cosine.R index 73befa2c..98646aca 100644 --- a/tests/testthat/test-cosine.R +++ b/tests/testthat/test-cosine.R @@ -3,11 +3,11 @@ test_that("neuprint_cosine_matrix works", { skip_if(as.logical(Sys.getenv("SKIP_NP_SERVER_TESTS"))) expect_known_hash( cm <- neuprint_cosine_matrix("/DA[1-3].*PN", grepl("ORN",type), partners='in'), - hash='f69bb3c63d') + hash='8e4e615aa3') expect_known_hash( cm2 <- neuprint_cosine_matrix("/DA[1-3].*PN", grepl("ORN",type), partners='in', group='type', details='type'), - '8ea9ca29f1') + '86cee222fe') expect_silent(neuprint_cosine_plot(cm)) expect_silent( diff --git a/tests/testthat/testdata/hemibrain_neuprint_ROI_hierarchy.rds b/tests/testthat/testdata/hemibrain_neuprint_ROI_hierarchy.rds index f9ffa0a9..5e251cd5 100644 Binary files a/tests/testthat/testdata/hemibrain_neuprint_ROI_hierarchy.rds and b/tests/testthat/testdata/hemibrain_neuprint_ROI_hierarchy.rds differ diff --git a/vignettes/hemibrain_opns.Rmd b/vignettes/hemibrain_opns.Rmd index 7585b06d..6ee8dc0f 100644 --- a/vignettes/hemibrain_opns.Rmd +++ b/vignettes/hemibrain_opns.Rmd @@ -69,7 +69,7 @@ The main point is that you can then edit your R.environ file to contain informat `neuprint_token="YOUR_TOKEN_HERE"` `neuprint_server='https://neuprint.janelia.org/'` -`neuprint_dataset='hemibrain:v1.0'` +`neuprint_dataset='hemibrain:v1.1'` Leave a blank line at the end of the file.