diff options
author | tmartins <thigm85@gmail.com> | 2020-08-27 10:42:35 +0200 |
---|---|---|
committer | tmartins <thigm85@gmail.com> | 2020-08-27 10:42:35 +0200 |
commit | 2cbbcd24ebb65ebd4877b0c172304861b31514eb (patch) | |
tree | bf101b6bba1a0471f563541473bb83776c9bf626 /python | |
parent | 35a8d53194a329e80abc52fa30d04c85a7ce96de (diff) |
simplify setup
Diffstat (limited to 'python')
-rw-r--r-- | python/vespa/setup.py | 74 |
1 files changed, 13 insertions, 61 deletions
diff --git a/python/vespa/setup.py b/python/vespa/setup.py index 6a0768d24bb..c9ee130c197 100644 --- a/python/vespa/setup.py +++ b/python/vespa/setup.py @@ -1,47 +1,6 @@ import os -from pkg_resources import parse_version -from configparser import ConfigParser import setuptools -assert parse_version(setuptools.__version__) >= parse_version("36.2") - -# note: all settings are in settings.ini; edit there, not here -config = ConfigParser(delimiters=["="]) -config.read("settings.ini") -cfg = config["DEFAULT"] - -cfg_keys = "description keywords author author_email".split() -expected = ( - cfg_keys - + "lib_name user branch license status min_python audience language".split() -) -for o in expected: - assert o in cfg, "missing expected setting: {}".format(o) -setup_cfg = {o: cfg[o] for o in cfg_keys} - -licenses = { - "apache2": ( - "Apache Software License 2.0", - "OSI Approved :: Apache Software License", - ), -} -statuses = [ - "1 - Planning", - "2 - Pre-Alpha", - "3 - Alpha", - "4 - Beta", - "5 - Production/Stable", - "6 - Mature", - "7 - Inactive", -] -py_versions = ( - "2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 3.0 3.1 3.2 3.3 3.4 3.5 3.6 3.7 3.8".split() -) - -requirements = cfg.get("requirements", "").split() -lic = licenses[cfg["license"]] -min_python = cfg["min_python"] - def get_target_version(): build_nr = os.environ.get("GITHUB_RUN_NUMBER", "0+dev") @@ -49,30 +8,24 @@ def get_target_version(): return "{}.{}".format(version, build_nr) +min_python = "3.6" + setuptools.setup( - name=cfg["lib_name"], + name="pyvespa", version=get_target_version(), - license=lic[0], - classifiers=[ - "Development Status :: " + statuses[int(cfg["status"])], - "Intended Audience :: " + cfg["audience"].title(), - "License :: " + lic[1], - "Natural Language :: " + cfg["language"].title(), - ] - + [ - "Programming Language :: Python :: " + o - for o in py_versions[py_versions.index(min_python) :] - ], - url=cfg["git_url"], + description="Python API for vespa.ai", + keywords="vespa, search engine, data science", + author="Thiago G. Martins", + author_email="tmartins@verizonmedia.com", + license=( + "Apache Software License 2.0", + "OSI Approved :: Apache Software License", + ), packages=setuptools.find_packages(), include_package_data=True, - install_requires=requirements, - dependency_links=cfg.get("dep_links", "").split(), - python_requires=">=" + cfg["min_python"], - long_description=open("README.md").read(), - long_description_content_type="text/markdown", + install_requires=["requests", "pandas", "docker", "jinja2"], + python_requires=">=3.6", zip_safe=False, - entry_points={"console_scripts": cfg.get("console_scripts", "").split()}, data_files=[ ( "templates", @@ -83,5 +36,4 @@ setuptools.setup( ], ) ], - **setup_cfg ) |