Skip to content
Merged
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
8 changes: 6 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- setup.cfg
- setup.py
pull_request:
branches: [ "main" ]
types: [opened, synchronize, reopened]
paths:
- moldrug/**
- .github/workflows/tests.yml
Expand All @@ -23,14 +23,18 @@ on:
- setup.cfg
- setup.py

concurrency:
group: pr-${{ github.event.pull_request.number }}
cancel-in-progress: true

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
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.9, '3.10', 3.11, 3.12, 3.13]
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
6 changes: 6 additions & 0 deletions docs/source/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [unreleased]

### Removed

- Python 3.8 compatibility. The dependency `meeko @ git+https://github.com/ale94mleon/meeko.git@main` requires a higher Python version because building it requires `setuptools>=77.0.0`, which is not compatible with Python 3.8.

### Changed

- Move from `.rst` to `.md` on the documentation.
- Update installation instructions.
- Versioning: `Major.Minor.Patch` --> `Major.Minnor.Patch.postX` it helps to distinguish commits that are not yet included on the `Patch`.

### Fixed

- Meeko dependency and Python=3.12. Now we use a [simplified version of Meeko](https://github.com/ale94mleon/Meeko).
- The tests no longer rely on `/tmp`; they now create temporary files in the current directory instead. This approach was already used throughout the package, except in the tests. The change makes the behavior consistent and avoids issues that occurred on certain clusters when using `/tmp`.
- Prevent race condition when creating `error` directory during parallel execution.

Expand Down
50 changes: 23 additions & 27 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,40 +1,36 @@
[build-system]
requires=[
"setuptools>=61.0",
"versioningit",
requires = [
"setuptools>=77.0.0",
"versioningit",
]
build-backend = "setuptools.build_meta"

[project.urls]
Hompage = "https://github.com/ale94mleon/moldrug"
Documentation = "https://moldrug.readthedocs.io/en/latest/"
Discussions = "https://github.com/ale94mleon/moldrug/discussions"
Issues = "https://github.com/ale94mleon/moldrug/issues"
Changelog = "https://github.com/ale94mleon/moldrug/blob/main/docs/source/CHANGELOG.md"

[project]
requires-python = ">= 3.9 , < 3.14"
name = "moldrug"
dynamic = ["version"]
description = "moldrug is a python package for drug-oriented optimization on the chemical space."
readme = "README.rst"
license-files = ["LICENSE"]

authors=[
{name="Alejandro Martínez León", email="ale94mleon@gmail.com"},
authors = [
{ name = "Alejandro Martínez León", email = "ale94mleon@gmail.com" }
]

classifiers = [
"Development Status :: 4 - Beta",
"Operating System :: OS Independent",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Topic :: Scientific/Engineering :: Bio-Informatics",
"Topic :: Scientific/Engineering :: Chemistry",
]

keywords = [
"science",
"chemistry",
Expand All @@ -44,34 +40,37 @@ keywords = [
"genetic algorithm",
]

requires-python = ">= 3.8 , < 3.12"
dependencies = [
"crem",
"tqdm",
"numpy",
"pandas",
"pyyaml",
"dill",
"meeko>=0.4.0,<0.6.0",
"meeko @ git+https://github.com/ale94mleon/meeko.git@main",
"scipy", # a meeko dependency
"six",
"rdkit>=2022.3.5",
"scipy", # a meeko dependency
]

[project.license]
file = "LICENSE"

[project.optional-dependencies]
dev = ["requests", "pytest"]
dev = ["requests", "pytest", "dask[distributed]", "dask-jobqueue"]
cluster = ["dask[distributed]", "dask-jobqueue"]

[project.urls]
Homepage = "https://github.com/ale94mleon/moldrug"
Documentation = "https://moldrug.readthedocs.io/en/latest/"
Discussions = "https://github.com/ale94mleon/moldrug/discussions"
Issues = "https://github.com/ale94mleon/moldrug/issues"
Changelog = "https://github.com/ale94mleon/moldrug/blob/main/docs/source/CHANGELOG.md"

[tool.versioningit]
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 @@ -89,14 +88,11 @@ where = ["src"]

[tool.setuptools.package-data]
moldrug = [
"LICENSE",
"README.rst",
"data/*/*.yml",
"data/*/*.mol",
"data/*/*.smi",
"data/*/*.pdb",
"data/*/*.pdbqt",

]

[project.scripts]
Expand Down