X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=setup.py;h=bb062d7909fac1944b4c488da5e01cab6ba345ce;hb=refs%2Ftags%2Fv10.1.0;hp=3c8098630ab593c22dd41f7f97ebd50af00c8cc1;hpb=2b0e2d72595a5e25bd8f785138416d12829fbd64;p=osm%2FPLA.git diff --git a/setup.py b/setup.py index 3c80986..bb062d7 100755 --- a/setup.py +++ b/setup.py @@ -17,25 +17,23 @@ 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' -_maintainer = 'Lars Goran Magnusson' -_maintainer_email = 'lars-goran.magnusson@arctoslabs.com' +_author = "OSM Support" +_author_email = 'osmsupport@etsi.org' +_maintainer = 'OSM Support' +_maintainer_email = 'osmsupport@etsi.org' _license = 'Apache 2.0' _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, @@ -46,15 +44,6 @@ setup( license=_license, packages=[_name], package_dir={_name: _name}, - install_requires=[ - 'osm-common', - 'jinja2==2.10.3', - 'pymzn==0.18.*', - 'pyyaml==5.1.2' - ], - dependency_links=[ - 'git+https://osm.etsi.org/gerrit/osm/common.git#egg=osm-common', - ], include_package_data=True, entry_points={ "console_scripts": [