Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion R/conn.R
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion man/neuprint_login.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/testthat/test-conn.R
Original file line number Diff line number Diff line change
Expand Up @@ -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"
),
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-connectivity.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tests/testthat/test-cosine.R
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Binary file modified tests/testthat/testdata/hemibrain_neuprint_ROI_hierarchy.rds
Binary file not shown.
2 changes: 1 addition & 1 deletion vignettes/hemibrain_opns.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down