Skip to content

Commit

Permalink
Merge pull request #207 from jiajic/save_load_patch
Browse files Browse the repository at this point in the history
fix: `loadGiotto()` when similar spat_unit or feat_type is exists in the same object
  • Loading branch information
jiajic authored Jul 15, 2024
2 parents f288cf0 + 50719e7 commit a0cdcee
Show file tree
Hide file tree
Showing 4 changed files with 358 additions and 282 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Description: This package contains the Giotto object and subobject class
License: MIT + file LICENSE
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Depends:
base (>= 4.4.0),
utils (>= 4.4.0),
Expand All @@ -34,7 +34,7 @@ Imports:
data.table (>= 1.12.2),
dbscan (>= 1.1-3),
deldir (>= 1.0.6),
GiottoUtils (>= 0.1.7),
GiottoUtils (>= 0.1.10),
graphics,
grDevices,
igraph (>= 1.2.4.1),
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
- python environment installation and how it relates to default settings such as .condarc may have changed.
- `giottoImage` `name` slot now requires `character` and will not accept `NULL`

## bug fixes
- `loadGiotto()` no longer errors with similarly named spat_units or feat_types (e.g. "cell" and "new_cell" would previously throw an error)

## enhancements
- `verbose` param for `createNearestNetwork()`
- `checkGiottoEnvironment()` in addition to full filepaths, also now supports name of environment or installation directory
Expand Down
Loading

0 comments on commit a0cdcee

Please sign in to comment.