Skip to content

Commit

Permalink
Merge pull request #398 from alchemistry/prep-release-2.4.0
Browse files Browse the repository at this point in the history
prepare release 2.4.0 (for #396)
  • Loading branch information
orbeckst authored Sep 17, 2024
2 parents aaf5218 + dadd845 commit 882ecf9
Show file tree
Hide file tree
Showing 22 changed files with 463 additions and 3,116 deletions.
6 changes: 6 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# initial blackify #280
0095be256b369673526dff7ed754cc874f4128a2

# ensure all recent changes were black-formatted (prep for 2.4.0)
d7058a5a8e489a9213ed499e999bb226397bc708

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ __pycache__
*~
dist/

# auto-generated files
_version.py


8 changes: 4 additions & 4 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ The rules for this file:
* release numbers follow "Semantic Versioning" https://semver.org


??/??/2024 jaclark5, orbeckst
09/17/2024 jaclark5, orbeckst

* 2.4.0

Enhancements
- Addition of `block_average` function in both `convergence` and
`visualization` (Issue #380, PR #381)

Enhancements:
- add CITATION.cff file with all authors from AUTHORS (issue #394, PR #395)


Changes
- modernize build system: replaced setup.py,cfg with pyproject.toml (#385)

08/24/2024 xiki-tempula

Expand Down
7 changes: 3 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,11 @@
# We always display the full release string; if something else is
# desired, see the commented out code

from alchemlyb._version import get_versions

release = get_versions()["version"]
del get_versions
import alchemlyb

release = alchemlyb.__version__
version = release

# version = release.split("+")[0] # only major.minor.patch
# version = "."join(release.split(".")[:2]) # only major.minor

Expand Down
84 changes: 84 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
# alchemlyb

[build-system]
requires = ["setuptools", "wheel", "versioningit"]
build-backend = "setuptools.build_meta"

[project]
name = "alchemlyb"
description = "the simple alchemistry library"
authors = [
{ name = "Zhiyi Wu", email = "william@zhiyiwu.me" },
{ name = "David Dotson", email = "dotsdl@gmail.com" }
]
maintainers = [
{ name = "Zhiyi Wu", email = "william@zhiyiwu.me" },
{ name = "Oliver Beckstein", email = "orbeckst@gmail.com" }
]
dynamic = ["version"]

readme = { file = "README.md", content-type = "text/markdown" }
license = { text = "BSD" }
keywords = ["free energy", "MBAR", "thermodynamic integration",
"free energy perturbation", "FEP", "alchemistry", "analysis",
"GROMACS", "NAMD", "AMBER", "molecular dynamics"]
classifiers = [
"Development Status :: 5 - Production/Stable",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: BSD License",
"Operating System :: POSIX",
"Operating System :: MacOS :: MacOS X",
"Operating System :: Microsoft :: Windows",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Bio-Informatics",
"Topic :: Scientific/Engineering :: Chemistry",
"Topic :: Software Development :: Libraries :: Python Modules"
]
requires-python = ">=3.10"

dependencies = [
"numpy",
"pandas>=2.1",
"pymbar>=4",
"scipy",
"scikit-learn",
"matplotlib>=3.7",
"loguru",
"pyarrow",
]


[project.optional-dependencies]
tests = [
"pytest",
"alchemtest"
]

[project.urls]
Homepage = "https://github.com/alchemistry/alchemlyb"
Documentation = "https://alchemlyb.readthedocs.io/"
Repository = "https://github.com/alchemistry/alchemlyb"
Issues = "https://github.com/alchemistry/alchemlyb/issues"
Changelog = "https://github.com/alchemistry/alchemlyb/blob/master/CHANGES"
Discussions = "https://github.com/alchemistry/alchemlyb/discussions"


[tool.setuptools.packages.find]
where = ["src"]


[tool.versioningit]

[tool.versioningit.vcs]
default-tag = "0.0.0"
match = ["*"]

[tool.versioningit.write]
file = "src/alchemlyb/_version.py"


7 changes: 0 additions & 7 deletions setup.cfg

This file was deleted.

63 changes: 0 additions & 63 deletions setup.py

This file was deleted.

5 changes: 1 addition & 4 deletions src/alchemlyb/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@

import pandas as pd

from ._version import get_versions

__version__ = get_versions()["version"]
del get_versions
from ._version import __version__


def pass_attrs(func):
Expand Down
Loading

0 comments on commit 882ecf9

Please sign in to comment.