Use try instead of if in setup.py

This commit is contained in:
Kodi Arfer 2017-01-24 08:31:38 -08:00
parent 6e7e94dd8e
commit fe0fb6fba1

View File

@ -24,7 +24,6 @@ import re
import sys import sys
import runpy import runpy
import subprocess import subprocess
from distutils.spawn import find_executable
from setuptools import find_packages, setup from setuptools import find_packages, setup
@ -32,17 +31,18 @@ os.chdir(os.path.split(os.path.abspath(__file__))[0])
PKG = "hy" PKG = "hy"
VERSIONFILE = os.path.join(PKG, "version.py") VERSIONFILE = os.path.join(PKG, "version.py")
if os.path.exists('.git') and find_executable('git'): try:
__version__ = (subprocess.check_output __version__ = (subprocess.check_output
(["git", "describe", "--tags", "--dirty"]) (["git", "describe", "--tags", "--dirty"])
.decode('ASCII').strip() .decode('ASCII').strip()
.replace('-', '+', 1).replace('-', '.')) .replace('-', '+', 1).replace('-', '.'))
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__))
elif os.path.exists(VERSIONFILE): except (subprocess.CalledProcessError, OSError):
__version__ = runpy.run_path(VERSIONFILE)['__version__'] if os.path.exists(VERSIONFILE):
else: __version__ = runpy.run_path(VERSIONFILE)['__version__']
__version__ = "unknown" else:
__version__ = "unknown"
long_description = """Hy is a Python <--> Lisp layer. It helps long_description = """Hy is a Python <--> Lisp layer. It helps
make things work nicer, and lets Python and the Hy lisp variant play make things work nicer, and lets Python and the Hy lisp variant play