Two more minor fixes

kalininalab · Mar 14, 2024 · 0478d6c · 0478d6c
1 parent 571786e
commit 0478d6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -37,7 +37,7 @@ jobs:
       - name: Install environment
         shell: bash -l {0}
         run: |
-          mamba install -c conda-forge -c bioconda -y numpy pandas networkx matplotlib pytest setuptools pyscipopt"<4.0.0" foldseek mmseqs2 cd-hit mash tmalign cvxpy pytest-cov rdkit">=2022.09.1" pytest-cases scikit-learn">=1.2,<1.6" pyyaml h5py
+          mamba install -c conda-forge -c bioconda -y numpy pandas networkx matplotlib pytest setuptools pyscipopt"<4.0.0" foldseek mmseqs2 cd-hit mash tmalign diamond cvxpy pytest-cov rdkit">=2022.09.1" pytest-cases scikit-learn">=1.2,<1.6" pyyaml h5py
           pip install grakel
         
       - name: Run tests

diff --git a/datasail/cluster/mash.py b/datasail/cluster/mash.py
@@ -54,7 +54,7 @@ def run_mash(dataset: DataSet, threads: int = 1, log_dir: Optional[Path] = None)
         raise ValueError("Something went wrong with MASH. The output file does not exist.")
 
     dataset.cluster_map = dict((n, n) for n in dataset.names)
-    dataset.cluster_dist = read_mash_tsv(results_folder / "cluster.tsv", len(dataset.names))
+    dataset.cluster_distance = read_mash_tsv(results_folder / "cluster.tsv", len(dataset.names))
     dataset.cluster_names = dataset.names
 
     shutil.rmtree(results_folder, ignore_errors=True)