Merge branch 'develop' into update-rtd

Becksteinlab · Oct 10, 2024 · 6f65565 · 6f65565
2 parents 0eb2964 + ecd4da4
commit 6f65565
Show file tree

Hide file tree

Showing 5 changed files with 1,036 additions and 420 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,2 +1,3 @@
 # Autoformat all files using `black`
 8f061e7da99eb78353e9392d6929673da5b352a3
+91078a63c64ec9a1c2de7f72a835813b888d1c73
diff --git a/CHANGES b/CHANGES
@@ -66,6 +66,7 @@ Fixes
   to explicitly make a copy DataFrame of the data for angle padding (#242)
 * fix rcoulomb in CHARMM energy minimization MDP template file (PR #210)
 * fix ensemble.EnsembleAnalysis.check_groups_from_common_ensemble (#212)
+* updated versioneer (#285)
 
 
 2022-01-03    0.8.0

diff --git a/mdpow/__init__.py b/mdpow/__init__.py
@@ -52,3 +52,7 @@ def log_banner(logger):
 N_AVOGADRO = 6.02214179e23
 #: Boltzmann's constant |kB| in kJ mol^-1 (`kB NIST value`_).
 kBOLTZ = 1.3806504e-23 * 1e-3 * N_AVOGADRO
+
+from . import _version
+
+__version__ = _version.get_versions()["version"]