Skip to content

Commit f464acd

Browse files
Update from pkg-resources to importlib and bump to version 1.2.3
1 parent 750c462 commit f464acd

File tree

8 files changed

+25
-18
lines changed

8 files changed

+25
-18
lines changed

.github/workflows/test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install environment
3535
shell: bash -l {0}
3636
run: |
37-
mamba install -c conda-forge -c bioconda -y numpy"<2" pandas networkx matplotlib pytest setuptools pyscipopt scip"<=9.1" foldseek mmseqs2 cd-hit mash tmalign diamond cvxpy=1.5.3 pytest-cov rdkit">=2023.09.1" pytest-cases scikit-learn pyyaml h5py pyarrow tqdm
37+
mamba install -c conda-forge -c bioconda -y numpy"<2" pandas networkx matplotlib pytest setuptools pyscipopt scip"<=9.1" foldseek mmseqs2 cd-hit mash tmalign diamond cvxpy=1.5.3 pytest-cov rdkit">=2023.09.1" pytest-cases scikit-learn pyyaml h5py pyarrow tqdm importlib_resources
3838
pip install grakel
3939
4040
- name: Run tests

.github/workflows/test_all_pyv.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- name: Install environment
4141
shell: bash -l {0}
4242
run: |
43-
mamba install -c conda-forge -c bioconda -y numpy"<2" pandas networkx matplotlib pytest setuptools pyscipopt scip"<=9.1" foldseek mmseqs2 cd-hit mash tmalign diamond cvxpy=1.5.3 pytest-cov rdkit">=2023.09.1" pytest-cases scikit-learn pyyaml h5py pyarrow tqdm
43+
mamba install -c conda-forge -c bioconda -y numpy"<2" pandas networkx matplotlib pytest setuptools pyscipopt scip"<=9.1" foldseek mmseqs2 cd-hit mash tmalign diamond cvxpy=1.5.3 pytest-cov rdkit">=2023.09.1" pytest-cases scikit-learn pyyaml h5py pyarrow tqdm importlib_resources
4444
pip install grakel
4545
4646
- name: Run tests

.github/workflows/test_rdkit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install environment
3737
shell: bash -l {0}
3838
run: |
39-
mamba install -c conda-forge -c bioconda -y numpy"<2" pandas networkx matplotlib pytest setuptools pyscipopt scip"<=9.1" foldseek mmseqs2 cd-hit mash tmalign diamond cvxpy=1.5.3 pytest-cov rdkit">=2023.03.1,<2023.09.1" pytest-cases scikit-learn pyyaml h5py pyarrow tqdm
39+
mamba install -c conda-forge -c bioconda -y numpy"<2" pandas networkx matplotlib pytest setuptools pyscipopt scip"<=9.1" foldseek mmseqs2 cd-hit mash tmalign diamond cvxpy=1.5.3 pytest-cov rdkit">=2023.03.1,<2023.09.1" pytest-cases scikit-learn pyyaml h5py pyarrow tqdm importlib_resources
4040
pip install grakel
4141
4242
- name: Run tests

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
- [ ] Include MASH for amino acid sequences
1313
- [ ] Custom clustering methods ([Issue #25](https://github.com/kalininalab/DataSAIL/issues/25))
1414

15+
## v1.2.3 (2025-10-21)
16+
17+
- Bug fixed in overflow handling.
18+
- Switch from `pkg-resources` to `importlib`.
19+
1520
## v1.2.2 (2025-10-14)
1621

1722
- Bug fixed in the evaluation module.

base_recipe.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package:
2-
version: '1.2.2'
2+
version: '1.2.3'
33

44
source:
55
path: ..
@@ -35,6 +35,7 @@ requirements:
3535
- h5py
3636
- pyarrow
3737
- tqdm
38+
- importlib_resources
3839

3940
about:
4041
home: https://github.com/kalininalab/DataSAIL

datasail/settings.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import platform
88

99
import cvxpy
10-
import pkg_resources
10+
import importlib_resources
1111

1212

1313
def get_default(data_type: str, data_format: str) -> Tuple[Optional[str], Optional[str]]:
@@ -134,17 +134,17 @@ def format2ending(fmt: str) -> str:
134134

135135
# YAML-files storing the arguments to the tools
136136
YAML_FILE_NAMES = {
137-
MMSEQS: pkg_resources.resource_filename("datasail", "args/mmseqs2.yaml"),
138-
MMSEQS2: pkg_resources.resource_filename("datasail", "args/mmseqs2.yaml"),
139-
MMSEQSPP: pkg_resources.resource_filename("datasail", "args/mmseqspp.yaml"),
140-
CDHIT: pkg_resources.resource_filename("datasail", "args/cdhit.yaml"),
141-
CDHIT_EST: pkg_resources.resource_filename("datasail", "args/cdhit_est.yaml"),
142-
DIAMOND: pkg_resources.resource_filename("datasail", "args/diamond.yaml"),
143-
FOLDSEEK: pkg_resources.resource_filename("datasail", "args/foldseek.yaml"),
144-
ECFP: pkg_resources.resource_filename("datasail", "args/.yaml"),
145-
MASH: pkg_resources.resource_filename("datasail", "args/mash.yaml"),
146-
MASH_SKETCH: pkg_resources.resource_filename("datasail", "args/mash_sketch.yaml"),
147-
MASH_DIST: pkg_resources.resource_filename("datasail", "args/mash_dist.yaml"),
137+
MMSEQS: importlib_resources.files("datasail") / "args/mmseqs2.yaml",
138+
MMSEQS2: importlib_resources.files("datasail") / "args/mmseqs2.yaml",
139+
MMSEQSPP: importlib_resources.files("datasail") / "args/mmseqspp.yaml",
140+
CDHIT: importlib_resources.files("datasail") / "args/cdhit.yaml",
141+
CDHIT_EST: importlib_resources.files("datasail") / "args/cdhit_est.yaml",
142+
DIAMOND: importlib_resources.files("datasail") / "args/diamond.yaml",
143+
FOLDSEEK: importlib_resources.files("datasail") / "args/foldseek.yaml",
144+
ECFP: importlib_resources.files("datasail") / "args/.yaml",
145+
MASH: importlib_resources.files("datasail") / "args/mash.yaml",
146+
MASH_SKETCH: importlib_resources.files("datasail") / "args/mash_sketch.yaml",
147+
MASH_DIST: importlib_resources.files("datasail") / "args/mash_dist.yaml",
148148
}
149149

150150
KW_CACHE = "cache"

datasail/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.2.2"
1+
__version__ = "1.2.3"

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "datasail"
3-
version = "1.2.2"
3+
version = "1.2.3"
44
repository = "https://github.com/kalininalab/DataSAIL"
55
readme = "README.md"
66
description = "A package to compute hard out-of-distribution data splits for machine learning, challenging generalization of models."
@@ -29,6 +29,7 @@ h5py = "*"
2929
pyarrow = "*"
3030
tqdm = "*"
3131
grakel = "<0.1.10"
32+
importlib_resources = "*"
3233

3334
[tool.poetry.dev-dependencies]
3435
setuptools = "*"

0 commit comments

Comments
 (0)