Skip to content

Commit f013b2b

Browse files
committed
Set optional dependencies, bump version
1 parent 025e656 commit f013b2b

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

im2deep/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""IM2Deep: Deep learning framework for peptide collisional cross section prediction."""
22

3-
__version__ = "0.3.1"
3+
__version__ = "1.0.0"

im2deep/__main__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
from psm_utils.psm_list import PSMList
1919
from rich.logging import RichHandler
2020

21-
from im2deep._exceptions import IM2DeepError
22-
from im2deep.im2deep import predict_ccs
2321

2422
# from im2deep.calibrate import linear_calibration
2523

@@ -149,6 +147,12 @@ def main(
149147
"""Command line interface to IM2Deep."""
150148
setup_logging(log_level)
151149

150+
if multi:
151+
check_optional_dependencies()
152+
153+
from im2deep._exceptions import IM2DeepError
154+
from im2deep.im2deep import predict_ccs
155+
152156
with open(psm_file) as f:
153157
first_line_pred = f.readline().strip()
154158
if calibration_file:

im2deep/im2deep.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from psm_utils.psm_list import PSMList
77

88
from im2deep.calibrate import linear_calibration
9-
from im2deep.predict_multi import predict_multi
109
from im2deep.utils import ccs2im
1110

1211
LOGGER = logging.getLogger(__name__)
@@ -62,6 +61,8 @@ def predict_ccs(
6261
)
6362

6463
if multi:
64+
from im2deep.predict_multi import predict_multi
65+
6566
LOGGER.info("Predicting multiconformer CCS values...")
6667
pred_df = predict_multi(
6768
psm_list_pred,

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ dependencies = [
2323
"deeplc",
2424
"psm_utils",
2525
"pandas",
26-
"numpy",
26+
"numpy==1.26.0",
2727
"rich",
2828
]
2929

0 commit comments

Comments
 (0)