Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ctapipe_io_lst version and __version__ of lstchain #253

Merged
merged 5 commits into from
Dec 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lstchain/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@

from .io import standard_config

from . import version
__version__ = version.get_version(pep440=False)
from .version import get_version
__version__ = get_version(pep440=False)
40 changes: 21 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/usr/bin/env python
# Licensed under a 3-clause BSD style license - see LICENSE.rst
# import sys
import setuptools
import lstchain
from setuptools import setup, find_packages
import os
from version import get_version, update_release_version

update_release_version()
version = get_version()

def find_scripts(script_dir, prefix):
script_list = [f'{os.path.splitext(f)[0]}' for f in os.listdir(script_dir) if f.startswith(prefix)]
Expand All @@ -22,20 +24,20 @@ def find_scripts(script_dir, prefix):
entry_points = {}
entry_points['console_scripts'] = lstchain_list + onsite_list + tools_list

setuptools.setup(name='lstchain',
version=lstchain.__version__,
description="DESCRIPTION", # these should be minimum list of what is needed to run
packages=setuptools.find_packages(),
install_requires=['h5py',
'seaborn'
],
package_data={'lstchain': ['data/lstchain_standard_config.json']},
tests_require=['pytest', 'pytest-ordering'],
author='LST collaboration',
author_email='',
license='',
url='https://github.com/cta-observatory/cta-lstchain',
long_description='',
classifiers=[],
entry_points=entry_points
)
setup(name='lstchain',
version=version,
description="DESCRIPTION", # these should be minimum list of what is needed to run
packages=find_packages(),
install_requires=['h5py',
'seaborn'
],
package_data={'lstchain': ['data/lstchain_standard_config.json']},
tests_require=['pytest', 'pytest-ordering'],
author='LST collaboration',
author_email='',
license='',
url='https://github.com/cta-observatory/cta-lstchain',
long_description='',
classifiers=[],
entry_points=entry_points
)
170 changes: 170 additions & 0 deletions version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
"""
Get version identification from git.


The update_release_version() function writes the current version to the
VERSION file. This function should be called before packaging a release version.

Use the get_version() function to get the version string, including the latest
commit, from git.
If git is not available the VERSION file will be read.

Heres an example of such a version string:

v0.2.0.post58+git57440dc


This script was taken from here:
https://github.com/cta-observatory/ctapipe/blob/master/ctapipe/version.py

but the original code comes from here:
https://github.com/aebrahim/python-git-version

Combining ideas from
http://blogs.nopcode.org/brainstorm/2013/05/20/pragmatic-python-versioning-via-setuptools-and-git-tags/
and Python Versioneer
https://github.com/warner/python-versioneer
but being much more lightwheight

"""
from subprocess import check_output, CalledProcessError
from os import path, name, devnull, environ, listdir

__all__ = ("get_version",)

CURRENT_DIRECTORY = path.dirname(path.abspath(__file__))
VERSION_FILE = path.join(CURRENT_DIRECTORY, 'lstchain', "_version_cache.py")

GIT_COMMAND = "git"

if name == "nt":
def find_git_on_windows():
"""find the path to the git executable on windows"""
# first see if git is in the path
try:
check_output(["where", "/Q", "git"])
# if this command succeeded, git is in the path
return "git"
# catch the exception thrown if git was not found
except CalledProcessError:
pass
# There are several locations git.exe may be hiding
possible_locations = []
# look in program files for msysgit
if "PROGRAMFILES(X86)" in environ:
possible_locations.append("%s/Git/cmd/git.exe" %
environ["PROGRAMFILES(X86)"])
if "PROGRAMFILES" in environ:
possible_locations.append("%s/Git/cmd/git.exe" %
environ["PROGRAMFILES"])
# look for the github version of git
if "LOCALAPPDATA" in environ:
github_dir = "%s/GitHub" % environ["LOCALAPPDATA"]
if path.isdir(github_dir):
for subdir in listdir(github_dir):
if not subdir.startswith("PortableGit"):
continue
possible_locations.append("%s/%s/bin/git.exe" %
(github_dir, subdir))
for possible_location in possible_locations:
if path.isfile(possible_location):
return possible_location
# git was not found
return "git"

GIT_COMMAND = find_git_on_windows()


def get_git_describe_version(abbrev=7):
"""return the string output of git desribe"""
try:
with open(devnull, "w") as fnull:
arguments = [GIT_COMMAND, "describe", "--tags",
"--abbrev=%d" % abbrev]
return check_output(arguments, cwd=CURRENT_DIRECTORY,
stderr=fnull).decode("ascii").strip()
except (OSError, CalledProcessError):
return None


def format_git_describe(git_str, pep440=False):
"""format the result of calling 'git describe' as a python version"""

if "-" not in git_str: # currently at a tag
formatted_str = git_str
else:
# formatted as version-N-githash
# want to convert to version.postN-githash
git_str = git_str.replace("-", ".post", 1)
if pep440: # does not allow git hash afterwards
formatted_str = git_str.split("-")[0]
else:
formatted_str = git_str.replace("-g", "+git")

# need to remove the "v" to have a proper python version
if formatted_str.startswith('v'):
formatted_str = formatted_str[1:]

return formatted_str


def read_release_version():
"""Read version information from VERSION file"""
try:
from ._version_cache import version
if len(version) == 0:
version = None
return version
except ImportError:
return "unknown"


def update_release_version(pep440=False):
"""Release versions are stored in a file called VERSION.
This method updates the version stored in the file.
This function should be called when creating new releases.
It is called by setup.py when building a package.


pep440: bool
When True, this function returns a version string suitable for
a release as defined by PEP 440. When False, the githash (if
available) will be appended to the version string.

"""
version = get_version(pep440=pep440)
with open(VERSION_FILE, "w") as outfile:
outfile.write(f"version='{version}'")
outfile.write("\n")


def get_version(pep440=False):
"""Tracks the version number.

pep440: bool
When True, this function returns a version string suitable for
a release as defined by PEP 440. When False, the githash (if
available) will be appended to the version string.

The file VERSION holds the version information. If this is not a git
repository, then it is reasonable to assume that the version is not
being incremented and the version returned will be the release version as
read from the file.

However, if the script is located within an active git repository,
git-describe is used to get the version information.

The file VERSION will need to be changed manually.
"""

raw_git_version = get_git_describe_version()
if not raw_git_version: # not a git repository
return read_release_version()

git_version = format_git_describe(raw_git_version, pep440=pep440)

return git_version


if __name__ == "__main__":
print(get_version())