Skip to content

Commit

Permalink
Merge pull request #87 from openforcefield/versioningit
Browse files Browse the repository at this point in the history
Switch version handling to use `versioningit`
  • Loading branch information
mattwthompson authored Dec 17, 2024
2 parents 1b6a2a3 + 8bad98c commit 8fa8bbe
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 728 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up conda environment
uses: mamba-org/setup-micromamba@v2
Expand Down
2 changes: 1 addition & 1 deletion devtools/conda-envs/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ channels:
dependencies:
- python
- pip
- versioneer-518
- versioningit

- openff-toolkit
- openff-interchange =0.4
Expand Down
12 changes: 5 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
[build-system]
requires = ["setuptools", "versioneer[toml]==0.29"]
requires = [
"setuptools",
"versioningit",
]
build-backend = "setuptools.build_meta"

[tool.versioneer]
VCS = "git"
style = "pep440"
versionfile_source = "yammbs/_version.py"
versionfile_build = "yammbs/_version.py"
tag_prefix = "v"
[tool.versioningit]

[tool.ruff]
line-length = 119
Expand Down
9 changes: 0 additions & 9 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ exclude =
[coverage:run]
omit =
yammbs/_tests/*
versioneer.py
setup.py
yammbs/_version.py

[coverage:report]
exclude_lines =
Expand All @@ -46,13 +44,6 @@ per-file-ignores =
[isort]
profile = black

[versioneer]
VCS = git
style = pep440
versionfile_source = yammbs/_version.py
versionfile_build = yammbs/_version.py
tag_prefix = 'v'

[mypy]
plugins = pydantic.mypy,sqlmypy
warn_unused_configs = True
Expand Down
7 changes: 0 additions & 7 deletions setup.py

This file was deleted.

5 changes: 3 additions & 2 deletions yammbs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from importlib.metadata import version

from yammbs._store import MoleculeStore
from yammbs._version import get_versions

__all__ = ("MoleculeStore",)

__version__ = get_versions()["version"]
__version__ = version("yammbs")
Loading

0 comments on commit 8fa8bbe

Please sign in to comment.