Skip to content

Commit 945c866

Browse files
authored
Use lighter Meeko package (#18)
* Using lighted Meeko version * Update versioning * Fixing the package structure * Update CI * Dropping py3.8 compatibility
1 parent d8f82a3 commit 945c866

3 files changed

Lines changed: 35 additions & 29 deletions

File tree

.github/workflows/tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
- setup.cfg
1515
- setup.py
1616
pull_request:
17-
branches: [ "main" ]
17+
types: [opened, synchronize, reopened]
1818
paths:
1919
- moldrug/**
2020
- .github/workflows/tests.yml
@@ -23,14 +23,18 @@ on:
2323
- setup.cfg
2424
- setup.py
2525

26+
concurrency:
27+
group: pr-${{ github.event.pull_request.number }}
28+
cancel-in-progress: true
29+
2630
jobs:
2731
build:
2832
runs-on: ${{ matrix.os }}
2933
strategy:
3034
fail-fast: false
3135
matrix:
3236
os: [ubuntu-latest, macOS-latest] #windows-latest (vina is not available for windows in conda-forge),m think about use bioconda autodock-vina
33-
python-version: [3.8, 3.9, '3.10', 3.11]
37+
python-version: [3.9, '3.10', 3.11, 3.12, 3.13]
3438
steps:
3539
- uses: actions/checkout@v4
3640
- name: Set up Python ${{ matrix.python-version }}

docs/source/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [unreleased]
99

10+
### Removed
11+
12+
- 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.
13+
1014
### Changed
1115

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

1520
### Fixed
1621

22+
- Meeko dependency and Python=3.12. Now we use a [simplified version of Meeko](https://github.com/ale94mleon/Meeko).
1723
- 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`.
1824
- Prevent race condition when creating `error` directory during parallel execution.
1925

pyproject.toml

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,36 @@
11
[build-system]
2-
requires=[
3-
"setuptools>=61.0",
4-
"versioningit",
2+
requires = [
3+
"setuptools>=77.0.0",
4+
"versioningit",
55
]
66
build-backend = "setuptools.build_meta"
77

8-
[project.urls]
9-
Hompage = "https://github.com/ale94mleon/moldrug"
10-
Documentation = "https://moldrug.readthedocs.io/en/latest/"
11-
Discussions = "https://github.com/ale94mleon/moldrug/discussions"
12-
Issues = "https://github.com/ale94mleon/moldrug/issues"
13-
Changelog = "https://github.com/ale94mleon/moldrug/blob/main/docs/source/CHANGELOG.md"
14-
158
[project]
9+
requires-python = ">= 3.9 , < 3.14"
1610
name = "moldrug"
1711
dynamic = ["version"]
1812
description = "moldrug is a python package for drug-oriented optimization on the chemical space."
1913
readme = "README.rst"
14+
license-files = ["LICENSE"]
2015

21-
authors=[
22-
{name="Alejandro Martínez León", email="ale94mleon@gmail.com"},
16+
authors = [
17+
{ name = "Alejandro Martínez León", email = "ale94mleon@gmail.com" }
2318
]
2419

2520
classifiers = [
2621
"Development Status :: 4 - Beta",
2722
"Operating System :: OS Independent",
2823
"Intended Audience :: Science/Research",
29-
"License :: OSI Approved :: Apache Software License",
3024
"Programming Language :: Python :: 3",
31-
"Programming Language :: Python :: 3.8",
3225
"Programming Language :: Python :: 3.9",
3326
"Programming Language :: Python :: 3.10",
3427
"Programming Language :: Python :: 3.11",
28+
"Programming Language :: Python :: 3.12",
29+
"Programming Language :: Python :: 3.13",
3530
"Topic :: Scientific/Engineering :: Bio-Informatics",
3631
"Topic :: Scientific/Engineering :: Chemistry",
3732
]
33+
3834
keywords = [
3935
"science",
4036
"chemistry",
@@ -44,34 +40,37 @@ keywords = [
4440
"genetic algorithm",
4541
]
4642

47-
requires-python = ">= 3.8 , < 3.12"
4843
dependencies = [
4944
"crem",
5045
"tqdm",
5146
"numpy",
5247
"pandas",
5348
"pyyaml",
5449
"dill",
55-
"meeko>=0.4.0,<0.6.0",
50+
"meeko @ git+https://github.com/ale94mleon/meeko.git@main",
51+
"scipy", # a meeko dependency
5652
"six",
5753
"rdkit>=2022.3.5",
58-
"scipy", # a meeko dependency
5954
]
6055

61-
[project.license]
62-
file = "LICENSE"
63-
6456
[project.optional-dependencies]
65-
dev = ["requests", "pytest"]
57+
dev = ["requests", "pytest", "dask[distributed]", "dask-jobqueue"]
6658
cluster = ["dask[distributed]", "dask-jobqueue"]
6759

60+
[project.urls]
61+
Homepage = "https://github.com/ale94mleon/moldrug"
62+
Documentation = "https://moldrug.readthedocs.io/en/latest/"
63+
Discussions = "https://github.com/ale94mleon/moldrug/discussions"
64+
Issues = "https://github.com/ale94mleon/moldrug/issues"
65+
Changelog = "https://github.com/ale94mleon/moldrug/blob/main/docs/source/CHANGELOG.md"
66+
6867
[tool.versioningit]
6968
default-version = "1+unknown"
7069

7170
[tool.versioningit.format]
72-
distance = "{base_version}"
73-
dirty = "{base_version}"
74-
distance-dirty = "{base_version}"
71+
distance = "{base_version}.post{distance}"
72+
dirty = "{base_version}.post{distance}.dev0"
73+
distance-dirty = "{base_version}.post{distance}.dev0"
7574

7675
[tool.versioningit.vcs]
7776
method = "git"
@@ -89,14 +88,11 @@ where = ["src"]
8988

9089
[tool.setuptools.package-data]
9190
moldrug = [
92-
"LICENSE",
93-
"README.rst",
9491
"data/*/*.yml",
9592
"data/*/*.mol",
9693
"data/*/*.smi",
9794
"data/*/*.pdb",
9895
"data/*/*.pdbqt",
99-
10096
]
10197

10298
[project.scripts]

0 commit comments

Comments
 (0)