Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #1821 from nmeum/prefer-version-file

Browse Source 
get_version.py: Prefer VERSIONFILE over git-describe(1)
This commit is contained in:
Kodi Arfer 2019-09-23 15:56:09 -04:00 committed by GitHub
commit 32a734cedc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -92,3 +92,4 @@
* Brandon T. Willard <brandonwillard@gmail.com> * Brandon T. Willard <brandonwillard@gmail.com>
* Andrew R. M. <nixy@nixy.moe> * Andrew R. M. <nixy@nixy.moe>
* Tristan de Cacqueray <tdecacqu@redhat.com> * Tristan de Cacqueray <tdecacqu@redhat.com>
* Sören Tempel <soeren@soeren-tempel.net>

7
get_version.py
View File

@ -5,7 +5,10 @@ import os, subprocess, runpy
os.chdir(os.path.split(os.path.abspath(__file__))[0]) os.chdir(os.path.split(os.path.abspath(__file__))[0])
VERSIONFILE = os.path.join("hy", "version.py") VERSIONFILE = os.path.join("hy", "version.py")
try: if "HY_VERSION" in os.environ:
__version__ = os.environ["HY_VERSION"]
else:
try:
__version__ = (subprocess.check_output __version__ = (subprocess.check_output
(["git", "describe", "--tags", "--dirty"]) (["git", "describe", "--tags", "--dirty"])
.decode('ASCII').strip() .decode('ASCII').strip()
@ -13,7 +16,7 @@ try:
with open(VERSIONFILE, "wt") as o: with open(VERSIONFILE, "wt") as o:
o.write("__version__ = {!r}\n".format(__version__)) o.write("__version__ = {!r}\n".format(__version__))
except (subprocess.CalledProcessError, OSError): except (subprocess.CalledProcessError, OSError):
if os.path.exists(VERSIONFILE): if os.path.exists(VERSIONFILE):
__version__ = runpy.run_path(VERSIONFILE)['__version__'] __version__ = runpy.run_path(VERSIONFILE)['__version__']
else: else: