diff --git a/rever.xsh b/rever.xsh deleted file mode 100644 index 7270f322a..000000000 --- a/rever.xsh +++ /dev/null @@ -1,18 +0,0 @@ -$PROJECT = 'regolith' -$ACTIVITIES = ['version_bump', - 'changelog', - 'tag', - 'push_tag', - 'ghrelease', - 'conda_forge'] - -$VERSION_BUMP_PATTERNS = [ - ('regolith/__init__.py', '__version__\s*=.*', "__version__ = '$VERSION'"), - ('setup.py', 'version\s*=.*,', "version='$VERSION',") - ] -$CHANGELOG_FILENAME = 'CHANGELOG.rst' -$CHANGELOG_IGNORE = ['TEMPLATE.rst'] -$PUSH_TAG_REMOTE = 'git@github.com:regro/regolith.git' - -$GITHUB_ORG = 'regro' -$GITHUB_REPO = 'regolith' diff --git a/src/regolith/__init__.py b/src/regolith/__init__.py index 0d5143d00..5e614912d 100644 --- a/src/regolith/__init__.py +++ b/src/regolith/__init__.py @@ -3,10 +3,16 @@ from xonsh.built_ins import XSH from xonsh.execer import Execer +from regolith.version import __version__ + +"""A Research group database management system""" + +# silence the pyflakes syntax checker +assert __version__ or True + + XSH.load(execer=Execer()) execer = XSH.execer xonsh.imphooks.install_import_hooks(execer=execer) -__version__ = "0.8.2" - del xonsh diff --git a/src/regolith/version.py b/src/regolith/version.py index 04517257c..9807f59a8 100644 --- a/src/regolith/version.py +++ b/src/regolith/version.py @@ -3,10 +3,10 @@ # # regolith by DANSE Diffraction group # Simon J. L. Billinge -# (c) 2011 The Trustees of Columbia University +# (c) 2011-2024 The Trustees of Columbia University # in the City of New York. All rights reserved. # -# File coded by: Pavol Juhas +# File coded by: Pavol Juhas, Simon Billinge # # See AUTHORS.txt for a list of people who contributed. # See LICENSE_DANSE.txt for license information. @@ -55,4 +55,14 @@ del cp +# from cookiecutter in case we want to migrate later: +# +# # We do not use the other three variables, but can be added back if needed. +# # __all__ = ["__date__", "__git_commit__", "__timestamp__", "__version__"] + +# # obtain version information +# from importlib.metadata import version +# +# __version__ = version("regolith") + # End of file