Skip to content

Commit 5eb50a0

Browse files
j-adamczykj-adamczyk
authored
Fix datasets typing (#504)
1 parent 1d279a9 commit 5eb50a0

File tree

22 files changed

+84
-84
lines changed

22 files changed

+84
-84
lines changed

‎skfp/datasets/lrgb/benchmark.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def load_lrgb_mol_dataset(
126126
standardize_labels: bool = True,
127127
as_frame: bool = False,
128128
verbose: bool = False,
129-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
129+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
130130
"""
131131
Load LRGB molecular dataset by name.
132132

‎skfp/datasets/lrgb/peptides_func.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def load_peptides_func(
2121
mol_type: str = "SMILES",
2222
as_frame: bool = False,
2323
verbose: bool = False,
24-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
24+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
2525
"""
2626
Load the Peptides-func dataset.
2727

‎skfp/datasets/lrgb/peptides_struct.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def load_peptides_struct(
2424
standardize_labels: bool = True,
2525
as_frame: bool = False,
2626
verbose: bool = False,
27-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
27+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
2828
"""
2929
Load the Peptides-struct dataset.
3030

‎skfp/datasets/moleculeace/benchmark.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ def load_moleculeace_dataset(
235235
data_dir: str | os.PathLike | None = None,
236236
as_frame: bool = False,
237237
verbose: bool = False,
238-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
238+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
239239
"""
240240
Load MoleculeACE dataset by name.
241241

‎skfp/datasets/moleculeace/moleculeace.py‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def load_chembl204_ki(
1919
data_dir: str | os.PathLike | None = None,
2020
as_frame: bool = False,
2121
verbose: bool = False,
22-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
22+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
2323
r"""
2424
Load the ChEMBL204 Ki dataset.
2525
@@ -105,7 +105,7 @@ def load_chembl214_ki(
105105
data_dir: str | os.PathLike | None = None,
106106
as_frame: bool = False,
107107
verbose: bool = False,
108-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
108+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
109109
r"""
110110
Load the ChEMBL214 Ki dataset.
111111
@@ -191,7 +191,7 @@ def load_chembl218_ec50(
191191
data_dir: str | os.PathLike | None = None,
192192
as_frame: bool = False,
193193
verbose: bool = False,
194-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
194+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
195195
r"""
196196
Load the ChEMBL218 EC50 dataset.
197197
@@ -277,7 +277,7 @@ def load_chembl219_ki(
277277
data_dir: str | os.PathLike | None = None,
278278
as_frame: bool = False,
279279
verbose: bool = False,
280-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
280+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
281281
r"""
282282
Load the ChEMBL219 Ki dataset.
283283
@@ -363,7 +363,7 @@ def load_chembl228_ki(
363363
data_dir: str | os.PathLike | None = None,
364364
as_frame: bool = False,
365365
verbose: bool = False,
366-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
366+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
367367
r"""
368368
Load the ChEMBL228 Ki dataset.
369369
@@ -449,7 +449,7 @@ def load_chembl231_ki(
449449
data_dir: str | os.PathLike | None = None,
450450
as_frame: bool = False,
451451
verbose: bool = False,
452-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
452+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
453453
r"""
454454
Load the ChEMBL231 Ki dataset.
455455
@@ -535,7 +535,7 @@ def load_chembl233_ki(
535535
data_dir: str | os.PathLike | None = None,
536536
as_frame: bool = False,
537537
verbose: bool = False,
538-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
538+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
539539
r"""
540540
Load the ChEMBL233 Ki dataset.
541541
@@ -621,7 +621,7 @@ def load_chembl234_ki(
621621
data_dir: str | os.PathLike | None = None,
622622
as_frame: bool = False,
623623
verbose: bool = False,
624-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
624+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
625625
r"""
626626
Load the ChEMBL234 Ki dataset.
627627
@@ -707,7 +707,7 @@ def load_chembl235_ec50(
707707
data_dir: str | os.PathLike | None = None,
708708
as_frame: bool = False,
709709
verbose: bool = False,
710-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
710+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
711711
r"""
712712
Load the ChEMBL235 EC50 dataset.
713713
@@ -793,7 +793,7 @@ def load_chembl236_ki(
793793
data_dir: str | os.PathLike | None = None,
794794
as_frame: bool = False,
795795
verbose: bool = False,
796-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
796+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
797797
r"""
798798
Load the ChEMBL236 Ki dataset.
799799
@@ -879,7 +879,7 @@ def load_chembl237_ec50(
879879
data_dir: str | os.PathLike | None = None,
880880
as_frame: bool = False,
881881
verbose: bool = False,
882-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
882+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
883883
r"""
884884
Load the ChEMBL237 EC50 dataset.
885885
@@ -965,7 +965,7 @@ def load_chembl237_ki(
965965
data_dir: str | os.PathLike | None = None,
966966
as_frame: bool = False,
967967
verbose: bool = False,
968-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
968+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
969969
r"""
970970
Load the ChEMBL237 Ki dataset.
971971
@@ -1051,7 +1051,7 @@ def load_chembl238_ki(
10511051
data_dir: str | os.PathLike | None = None,
10521052
as_frame: bool = False,
10531053
verbose: bool = False,
1054-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1054+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
10551055
r"""
10561056
Load the ChEMBL238 Ki dataset.
10571057
@@ -1137,7 +1137,7 @@ def load_chembl239_ec50(
11371137
data_dir: str | os.PathLike | None = None,
11381138
as_frame: bool = False,
11391139
verbose: bool = False,
1140-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1140+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
11411141
r"""
11421142
Load the ChEMBL239 EC50 dataset.
11431143
@@ -1223,7 +1223,7 @@ def load_chembl244_ki(
12231223
data_dir: str | os.PathLike | None = None,
12241224
as_frame: bool = False,
12251225
verbose: bool = False,
1226-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1226+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
12271227
r"""
12281228
Load the ChEMBL244 Ki dataset.
12291229
@@ -1309,7 +1309,7 @@ def load_chembl262_ki(
13091309
data_dir: str | os.PathLike | None = None,
13101310
as_frame: bool = False,
13111311
verbose: bool = False,
1312-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1312+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
13131313
r"""
13141314
Load the ChEMBL262 Ki dataset.
13151315
@@ -1395,7 +1395,7 @@ def load_chembl264_ki(
13951395
data_dir: str | os.PathLike | None = None,
13961396
as_frame: bool = False,
13971397
verbose: bool = False,
1398-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1398+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
13991399
r"""
14001400
Load the ChEMBL264 Ki dataset.
14011401
@@ -1481,7 +1481,7 @@ def load_chembl287_ki(
14811481
data_dir: str | os.PathLike | None = None,
14821482
as_frame: bool = False,
14831483
verbose: bool = False,
1484-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1484+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
14851485
r"""
14861486
Load the ChEMBL287 Ki dataset.
14871487
@@ -1567,7 +1567,7 @@ def load_chembl1862_ki(
15671567
data_dir: str | os.PathLike | None = None,
15681568
as_frame: bool = False,
15691569
verbose: bool = False,
1570-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1570+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
15711571
r"""
15721572
Load the ChEMBL1862 Ki dataset.
15731573
@@ -1653,7 +1653,7 @@ def load_chembl1871_ki(
16531653
data_dir: str | os.PathLike | None = None,
16541654
as_frame: bool = False,
16551655
verbose: bool = False,
1656-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1656+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
16571657
r"""
16581658
Load the ChEMBL1871 Ki dataset.
16591659
@@ -1739,7 +1739,7 @@ def load_chembl2034_ki(
17391739
data_dir: str | os.PathLike | None = None,
17401740
as_frame: bool = False,
17411741
verbose: bool = False,
1742-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1742+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
17431743
r"""
17441744
Load the ChEMBL2034 Ki dataset.
17451745
@@ -1825,7 +1825,7 @@ def load_chembl2047_ec50(
18251825
data_dir: str | os.PathLike | None = None,
18261826
as_frame: bool = False,
18271827
verbose: bool = False,
1828-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1828+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
18291829
r"""
18301830
Load the ChEMBL2047 EC50 dataset.
18311831
@@ -1911,7 +1911,7 @@ def load_chembl2147_ki(
19111911
data_dir: str | os.PathLike | None = None,
19121912
as_frame: bool = False,
19131913
verbose: bool = False,
1914-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
1914+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
19151915
r"""
19161916
Load the ChEMBL2147 Ki dataset.
19171917
@@ -1997,7 +1997,7 @@ def load_chembl2835_ki(
19971997
data_dir: str | os.PathLike | None = None,
19981998
as_frame: bool = False,
19991999
verbose: bool = False,
2000-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
2000+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
20012001
r"""
20022002
Load the ChEMBL2835 Ki dataset.
20032003
@@ -2083,7 +2083,7 @@ def load_chembl2971_ki(
20832083
data_dir: str | os.PathLike | None = None,
20842084
as_frame: bool = False,
20852085
verbose: bool = False,
2086-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
2086+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
20872087
r"""
20882088
Load the ChEMBL2971 Ki dataset.
20892089
@@ -2169,7 +2169,7 @@ def load_chembl3979_ec50(
21692169
data_dir: str | os.PathLike | None = None,
21702170
as_frame: bool = False,
21712171
verbose: bool = False,
2172-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
2172+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
21732173
r"""
21742174
Load the ChEMBL3979 EC50 dataset.
21752175
@@ -2255,7 +2255,7 @@ def load_chembl4005_ki(
22552255
data_dir: str | os.PathLike | None = None,
22562256
as_frame: bool = False,
22572257
verbose: bool = False,
2258-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
2258+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
22592259
r"""
22602260
Load the ChEMBL4005 Ki dataset.
22612261
@@ -2341,7 +2341,7 @@ def load_chembl4203_ki(
23412341
data_dir: str | os.PathLike | None = None,
23422342
as_frame: bool = False,
23432343
verbose: bool = False,
2344-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
2344+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
23452345
r"""
23462346
Load the ChEMBL4203 Ki dataset.
23472347
@@ -2427,7 +2427,7 @@ def load_chembl4616_ec50(
24272427
data_dir: str | os.PathLike | None = None,
24282428
as_frame: bool = False,
24292429
verbose: bool = False,
2430-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
2430+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
24312431
r"""
24322432
Load the ChEMBL4616 EC50 dataset.
24332433
@@ -2513,7 +2513,7 @@ def load_chembl4792_ki(
25132513
data_dir: str | os.PathLike | None = None,
25142514
as_frame: bool = False,
25152515
verbose: bool = False,
2516-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
2516+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
25172517
r"""
25182518
Load the ChEMBL4792 Ki dataset.
25192519

‎skfp/datasets/moleculenet/bace.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def load_bace(
1919
data_dir: str | os.PathLike | None = None,
2020
as_frame: bool = False,
2121
verbose: bool = False,
22-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
22+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
2323
"""
2424
Load the BACE dataset.
2525

‎skfp/datasets/moleculenet/bbbp.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def load_bbbp(
1919
data_dir: str | os.PathLike | None = None,
2020
as_frame: bool = False,
2121
verbose: bool = False,
22-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
22+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
2323
"""
2424
Load the BBBP (Blood-Brain Barrier Penetration) dataset.
2525

‎skfp/datasets/moleculenet/benchmark.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def load_moleculenet_dataset(
167167
data_dir: str | os.PathLike | None = None,
168168
as_frame: bool = False,
169169
verbose: bool = False,
170-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
170+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
171171
"""
172172
Load MoleculeNet dataset by name.
173173

‎skfp/datasets/moleculenet/clintox.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def load_clintox(
1919
data_dir: str | os.PathLike | None = None,
2020
as_frame: bool = False,
2121
verbose: bool = False,
22-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
22+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
2323
r"""
2424
Load the ClinTox dataset.
2525

‎skfp/datasets/moleculenet/esol.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def load_esol(
1919
data_dir: str | os.PathLike | None = None,
2020
as_frame: bool = False,
2121
verbose: bool = False,
22-
) -> pd.DataFrame | tuple[list[str]] | np.ndarray:
22+
) -> pd.DataFrame | tuple[list[str], np.ndarray]:
2323
"""
2424
Load the ESOL (Estimated SOLubility) dataset.
2525

0 commit comments

Comments
 (0)