Skip to content

Commit

Permalink
NickAkhmetov/v0.2.7 Hotfix upstream build issues, remove redundant lo…
Browse files Browse the repository at this point in the history
…gs (#93)
  • Loading branch information
NickAkhmetov authored Oct 17, 2024
1 parent 40c7be6 commit 60fc83e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.6
0.2.7
4 changes: 3 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/portal_visualization/builders/scatterplot_builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions src/portal_visualization/builders/sprm_builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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\
Expand All @@ -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/
Expand Down

0 comments on commit 60fc83e

Please sign in to comment.