diff --git a/VERSION.txt b/VERSION.txt index 53a75d6..b003284 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.2.6 +0.2.7 diff --git a/setup.cfg b/setup.cfg index dbc1a3e..fc1736d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -20,7 +20,9 @@ package_dir = packages = find: python_requires = >=3.7 install_requires = - vitessce>=3.2.8 + # Currently pinned due to the added `spatialdata` dependency + # having a lot of uncapped dependencies that are causing conflicts with search-api downstream. + vitessce==3.4.0 hubmap-commons>=2.0.15 requests>=2.27.1 nbformat==5.1.3 diff --git a/src/portal_visualization/builders/scatterplot_builders.py b/src/portal_visualization/builders/scatterplot_builders.py index fd2e23a..8a21d96 100644 --- a/src/portal_visualization/builders/scatterplot_builders.py +++ b/src/portal_visualization/builders/scatterplot_builders.py @@ -30,7 +30,6 @@ def get_conf_cells(self, **kwargs): dataset = vc.add_dataset(name="Visualization Files") # The sublcass initializes _files in its __init__ method for file in self._files: - print(f"Adding file: {file}") dataset = dataset.add_file(**(self._replace_url_in_file(file))) vc = self._setup_scatterplot_view_config(vc, dataset) return get_conf_cells(vc) diff --git a/src/portal_visualization/builders/sprm_builders.py b/src/portal_visualization/builders/sprm_builders.py index e7df177..06c3d59 100644 --- a/src/portal_visualization/builders/sprm_builders.py +++ b/src/portal_visualization/builders/sprm_builders.py @@ -292,7 +292,6 @@ def get_conf_cells(self, marker=None): found_ids = self._find_ids() confs = [] for id in sorted(found_ids): - print(f'Adding SPRM view config for id {id}') builder = SPRMAnnDataViewConfBuilder( entity=self._entity, groups_token=self._groups_token, @@ -304,7 +303,6 @@ def get_conf_cells(self, marker=None): mask_name=f"{id}_{self._mask_id}" ) conf = builder.get_conf_cells(marker=marker).conf - print(f'Got SPRM view config for id {id}, conf: {conf}') if conf == {}: raise MultiImageSPRMAnndataViewConfigError( # pragma: no cover f"Cytokit SPRM assay with uuid {self._uuid} has empty view\ @@ -325,7 +323,6 @@ class StitchedCytokitSPRMViewConfBuilder(MultiImageSPRMAnndataViewConfBuilder): # Need to override base class settings due to different directory structure def __init__(self, entity, groups_token, assets_endpoint, **kwargs): super().__init__(entity, groups_token, assets_endpoint, **kwargs) - print('Using StitchedCytokitSPRMViewConfBuilder') self._image_pyramid_subdir = STITCHED_IMAGE_DIR # The ids don't match exactly with the replacement because all image files have # stitched_expressions appended while the subdirectory only has /stitched/