Skip to content

Update CytoTable Environment File #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 17, 2023
1 change: 0 additions & 1 deletion cytosnake/cli/exec/workflow_exec.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ def __base_exec(
unlock=unlock,
forceall=force,
use_conda=True,
conda_prefix=env_manager,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to open this parameter up to a CytoSnake user (if it isn't already)? Here I'm wondering whether one might want to distinguish between Snakemake defaults for the conda_prefix (mostly in external compute environments).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The configurational.yaml contains parameters on how to execute workflows. However, there's no set structure yet. That's a good point. I'll make this as a separate PR.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Created issue #57

conda_frontend=env_manager,
)

Expand Down
5 changes: 2 additions & 3 deletions cytosnake/helpers/datapaths.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,13 @@
"""

import pathlib
from typing import Optional
from collections import defaultdict
from typing import Optional

from cytosnake.utils import cyto_paths
from cytosnake.guards.path_guards import is_valid_path
from cytosnake.utils import cyto_paths
from cytosnake.utils.config_utils import load_general_configs, load_meta_path_configs


# loading in config files
META_PATH_CONFIGS = load_meta_path_configs()
GENERAL_CONFIGS = load_general_configs()
Expand Down
2 changes: 1 addition & 1 deletion workflows/envs/cytotable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ dependencies:
- python==3.8
- pip
- pip:
- git+https://github.com/cytomining/CytoTable.git@f336d26baf96b8b3d9ed6ca07f617895030bf038
- cytotable
1 change: 0 additions & 1 deletion workflows/scripts/aggregate_cells.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ def aggregate(

# Loading appropriate platemaps with given plate data
logging.info(f"Loading plate data from: {str(sqlite_file_path)}")
plate_file_check = pathlib.Path(sql_file).is_file()

# checking if the the sqli_file is found or it's a file type
if not pathlib.Path(sql_file).is_file():
Expand Down