Generate hy.version using git describe

This commit is contained in:
Kodi Arfer 2016-10-12 17:11:44 -07:00
parent 34304c41c7
commit 23c457cee5
4 changed files with 13 additions and 36 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/hy/version.py
*.pyc
*swp
*hy*egg*

View File

@ -19,7 +19,11 @@
# DEALINGS IN THE SOFTWARE.
from hy.version import __version__, __appname__ # NOQA
__appname__ = 'hy'
try:
from hy.version import __version__
except ImportError:
__version__ = 'unknown'
from hy.models.expression import HyExpression # NOQA

View File

@ -1,23 +0,0 @@
# Copyright (c) 2013 Paul Tagliamonte <paultag@debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
# to deal in the Software without restriction, including without limitation
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
# and/or sell copies of the Software, and to permit persons to whom the
# Software is furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
__appname__ = "hy"
__version__ = "0.11.0"

View File

@ -22,24 +22,19 @@
import os
import re
import sys
import subprocess
from setuptools import find_packages, setup
PKG = "hy"
VERSIONFILE = os.path.join(PKG, "version.py")
verstr = "unknown"
try:
verstrline = open(VERSIONFILE, "rt").read()
except EnvironmentError:
pass # Okay, there is no version file.
else:
VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]"
mo = re.search(VSRE, verstrline, re.M)
if mo:
__version__ = mo.group(1)
else:
msg = "if %s.py exists, it is required to be well-formed" % VERSIONFILE
raise RuntimeError(msg)
__version__ = subprocess.check_output([
"git", "describe", "--tags", "--dirty"]).decode('ASCII').strip()
with open(VERSIONFILE, "wt") as o:
o.write("__version__ = {!r}\n".format(__version__))
except subprocess.CalledProcessError:
__version__ = "unknown"
long_description = """Hy is a Python <--> Lisp layer. It helps
make things work nicer, and lets Python and the Hy lisp variant play