Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macOS-latest] #windows-latest (vina is not available for windows in conda-forge),m think about use bioconda autodock-vina
python-version: [3.8, 3.9, '3.10', 3.11]
python-version: [3.8, 3.9, '3.10', 3.11, 3.12, 3.13]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
705 changes: 504 additions & 201 deletions LICENSE

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,16 @@ keywords = [
"genetic algorithm",
]

requires-python = ">= 3.8 , < 3.12"
requires-python = ">= 3.8"
dependencies = [
"crem",
"tqdm",
"numpy",
"pandas",
"pyyaml",
"dill",
"meeko>=0.4.0,<0.6.0",
"six",
"scipy",
"rdkit>=2022.3.5",
"scipy", # a meeko dependency
]

[project.license]
Expand All @@ -68,9 +66,9 @@ dev = ["requests", "pytest"]
default-version = "1+unknown"

[tool.versioningit.format]
distance = "{base_version}"
dirty = "{base_version}"
distance-dirty = "{base_version}"
distance = "{base_version}.post{distance}"
dirty = "{base_version}.post{distance}.dev0"
distance-dirty = "{base_version}.post{distance}.dev0"

[tool.versioningit.vcs]
method = "git"
Expand All @@ -95,6 +93,7 @@ moldrug = [
"data/*/*.smi",
"data/*/*.pdb",
"data/*/*.pdbqt",
"meeko_light/data/params/*.json"

]

Expand Down
4 changes: 2 additions & 2 deletions src/moldrug/fitness.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import numpy as np
# from warnings import import warn
from meeko import (MoleculePreparation, PDBQTMolecule, PDBQTWriterLegacy,
RDKitMolCreate)
from moldrug.meeko_light import (MoleculePreparation,
PDBQTMolecule, PDBQTWriterLegacy, RDKitMolCreate)
from rdkit import Chem
from rdkit.Chem import QED, Descriptors

Expand Down
28 changes: 28 additions & 0 deletions src/moldrug/meeko_light/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
#
# This module was taken from Meeko 0.6.1
# https://github.com/forlilab/meeko
# Only unnecessary functionalities were removed.

__meeko_original_version__ = "0.6.1"

from .preparation import MoleculePreparation
from .molecule_pdbqt import PDBQTMolecule
from .rdkit_mol_create import RDKitMolCreate
from .writer import PDBQTWriterLegacy

import logging
from rdkit import rdBase
rdkit_logger = logging.getLogger("rdkit")
rdkit_logger.handlers[0].setLevel("WARNING")
rdkit_logger.handlers[0].setFormatter(
logging.Formatter('[RDKit] %(levelname)s:%(message)s'),
)
rdBase.LogToPythonLogger()

__all__ = ['MoleculePreparation',
'PDBQTMolecule',
'RDKitMolCreate',
'PDBQTWriterLegacy',
]
Loading
Loading