X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=setup.py;h=2c7cd04ad64bc1ac320648d93b2a4cc884204e72;hb=refs%2Ftags%2Fv9.1.1;hp=3c8098630ab593c22dd41f7f97ebd50af00c8cc1;hpb=2b0e2d72595a5e25bd8f785138416d12829fbd64;p=osm%2FPLA.git diff --git a/setup.py b/setup.py index 3c80986..2c7cd04 100755 --- a/setup.py +++ b/setup.py @@ -17,12 +17,11 @@ from setuptools import setup def parse_requirements(requirements): with open(requirements) as f: - return [l.strip('\n') for l in f if l.strip('\n') and not l.startswith('#') and '://' not in l] + return [req.strip('\n') for req in f if req.strip('\n') and not req.startswith('#') and '://' not in req] _name = 'osm_pla' -# _version_command = ('git describe --match v* --tags --long --dirty', 'pep440-git-full') FIXME we have no tags yet -_version = '0.0.1' # FIXME temporary workaround for _version_command +_version_command = ('git describe --match v* --tags --long --dirty', 'pep440-git-full') _description = 'OSM Placement Module' _author = "Lars Goran Magnusson" _author_email = 'lars-goran.magnusson@arctoslabs.com' @@ -34,8 +33,7 @@ _url = 'https://osm.etsi.org/gitweb?p=osm/PLA.git;a=tree' setup( name=_name, - # version_command=_version_command, FIXME temporary fix - version=_version, + version_command=_version_command, description=_description, long_description=open('README.md', encoding='utf-8').read(), author=_author, @@ -49,7 +47,7 @@ setup( install_requires=[ 'osm-common', 'jinja2==2.10.3', - 'pymzn==0.18.*', + 'pymzn==0.18.3', 'pyyaml==5.1.2' ], dependency_links=[