Skip to content

Commit 9527e92

Browse files
authored
Update dependencies (#518)
1 parent f64ab2e commit 9527e92

File tree

5 files changed

+806
-636
lines changed

5 files changed

+806
-636
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ test: ## Run tests
3939
uv run pytest tests --ignore=tests/datasets ;\
4040
fi
4141

42+
test_with_datasets: ## Run tests, always including dataset tests
43+
uv run ruff check
44+
uv run pytest tests
45+
4246
test-coverage: ## Run tests and calculate test coverage
4347
-mkdir .tmp_coverage_files
4448
uv run pytest --cov=skfp tests

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ requires-python = ">=3.10,<3.14"
2626
dependencies = [
2727
"descriptastorus>=2.0.0,<3",
2828
"e3fp>=1.2.6,<2",
29-
"huggingface_hub>=0.20.0,<1",
29+
"huggingface_hub>=0.20.0,<2",
3030
"joblib>=1.0.0,<2",
3131
"mordredcommunity>=2.0.0,<3",
3232
"numpy>=1.26.4,<3",
33-
"pandas>=1.5.3,<3",
33+
"pandas>=1.5.3,<4",
3434
"rdkit>=2023.9.6,<=2025.9.3",
3535
"scikit-learn>=1.6.0,<2",
3636
"scipy>=1.12.0,<2",

skfp/fingerprints/map.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,8 @@ def _get_atom_pair_shingles(self, mol: Mol, atoms_envs: dict) -> set[bytes]:
283283

284284
@staticmethod
285285
def _make_shingle(env_a: str | None, env_b: str | None, distance: int) -> str:
286-
env_a = env_a if env_a else ""
287-
env_b = env_b if env_b else ""
286+
env_a = env_a or ""
287+
env_b = env_b or ""
288288

289289
if len(env_a) > len(env_b):
290290
larger_env: str = env_a

skfp/preprocessing/input_output/smiles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def transform_x_y(self, X, y, copy: bool = False) -> tuple[list[Mol], np.ndarray
158158
def _transform_batch(self, X: Sequence[str]) -> list[Mol]:
159159
with no_rdkit_logs() if self.suppress_warnings else nullcontext():
160160
require_strings(X)
161-
replacements = self.replacements if self.replacements else {}
161+
replacements = self.replacements or {}
162162
return [
163163
MolFromSmiles(smi, sanitize=self.sanitize, replacements=replacements)
164164
for smi in X

0 commit comments

Comments
 (0)