Skip to content

Commit f836d76

Browse files
committed
[FIX] new requirements to be in line with new rdkit versions
1 parent 3505738 commit f836d76

8 files changed

Lines changed: 10 additions & 10 deletions

File tree

extra-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rdkit==2023.9.6: preprocessing, deep-learning, machine-learning, test
1+
rdkit==2025.9.6: preprocessing, deep-learning, machine-learning, test
22
smilespe==0.0.3: preprocessing, deep-learning, machine-learning, test
33
seaborn: preprocessing, deep-learning, machine-learning, test
44
joblib: preprocessing, deep-learning, machine-learning, test

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rdkit==2023.9.6
1+
rdkit==2025.9.6
22
smilespe==0.0.3
33
seaborn
44
torchvision

setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ python_requires = >=3.9
2424
zip_safe = False
2525
include_package_data = True
2626
install_requires =
27-
rdkit==2023.9.6
27+
rdkit==2025.9.6
2828
cached_property==1.5.2
2929
seaborn
3030
joblib

src/deepmol/models/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
from .deepchem_models import DeepChemModel
33
from .transformer_models import TransformerModelForMaskedLM, DeBERTa, ModernBERT, BERT, RoBERTa
44
from .atmol.atmol import AtMolLightning as ATMOL
5-
from .keras_models import KerasModel
65
except NameError:
76
pass
87
from .sklearn_models import SklearnModel
98
from .ensembles import VotingClassifier
109
from .models import Model
10+
from .keras_models import KerasModel

tests/integration_tests/dataset/test_dataset_features.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def test_dataset_with_similarity_matrix(self):
2626
def test_dataset_with_nc_fp(self):
2727
from deepmol.compound_featurization import NcMfp
2828
NcMfp().featurize(self.small_dataset_to_test, inplace=True)
29-
self.assertEqual(self.small_dataset_to_test.X.shape[0], 13)
29+
self.assertEqual(self.small_dataset_to_test.X.shape[0], 11)
3030
self.assertEqual(self.small_dataset_to_test.X.shape[1], 254399)
3131

3232
def test_dataset_with_neural_npfp(self):

tests/integration_tests/dataset/test_dataset_models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import numpy as np
2727

2828
def model_build(): # num = number of categories
29-
input_f = layers.Input(shape=(210,))
29+
input_f = layers.Input(shape=(217,))
3030

3131
X = layers.Dense(2048, activation = 'relu')(input_f)
3232
X = layers.BatchNormalization()(X)
@@ -42,7 +42,7 @@ def model_build(): # num = number of categories
4242
return model
4343

4444
def model_build_regression(): # num = number of categories
45-
input_f = layers.Input(shape=(210,))
45+
input_f = layers.Input(shape=(217,))
4646

4747
X = layers.Dense(2048, activation = 'relu')(input_f)
4848
X = layers.BatchNormalization()(X)

tests/unit_tests/splitters/test_butina_splitter.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def test_scaffold_spliter_non_homogenous_dataset(self):
131131
seed=123,
132132
homogenous_datasets=False)
133133

134-
self.assertEqual(len(train_dataset.smiles), len(test_dataset.smiles))
134+
self.assertAlmostEqual(len(train_dataset.smiles), len(test_dataset.smiles), delta=1)
135135
self.assertAlmostEqual(
136136
len(train_dataset.y[train_dataset.y == 1]) / len(train_dataset.y),
137137
len(self.binary_dataset.y[self.binary_dataset.y == 1]) / len(self.binary_dataset.y),

tests/unit_tests/splitters/test_scaffold_splitter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_scaffold_splitter_larger_dataset_binary_classification(self):
5757
frac_train=0.5,
5858
seed=123)
5959

60-
self.assertEqual(len(train_dataset.smiles), len(test_dataset.smiles))
60+
self.assertAlmostEqual(len(train_dataset.smiles), len(test_dataset.smiles), delta=1)
6161
self.assertAlmostEqual(
6262
len(train_dataset.y[train_dataset.y == 1]) / len(train_dataset.y),
6363
len(self.binary_dataset.y[self.binary_dataset.y == 1]) / len(self.binary_dataset.y),
@@ -107,7 +107,7 @@ def test_scaffold_spliter_non_homogenous_dataset(self):
107107
seed=123,
108108
homogenous_datasets=False)
109109

110-
self.assertEqual(len(train_dataset.smiles), len(test_dataset.smiles))
110+
self.assertAlmostEqual(len(train_dataset.smiles), len(test_dataset.smiles), delta=1)
111111
self.assertAlmostEqual(
112112
len(train_dataset.y[train_dataset.y == 1]) / len(train_dataset.y),
113113
len(self.binary_dataset.y[self.binary_dataset.y == 1]) / len(self.binary_dataset.y),

0 commit comments

Comments
 (0)