Move files around to fit pypi better

[netvirt.git] / resources / tools / odltools / setup.py

diff --git a/resources/tools/odltools/setup.py b/resources/tools/odltools/setup.py
index 97a7472daae6d8a07e6e5db54100d89e406c46bb..9a0f650e4d4ba9f7522a61d21c871eec316d6b79 100644 (file)
--- a/resources/tools/odltools/setup.py
+++ b/resources/tools/odltools/setup.py
@@ -1,35 +1,43 @@
 import io
-import re
 from setuptools import find_packages
 from setuptools import setup
+import textwrap
+from odltools import __version__
 
 
-# with io.open('README.rst', 'rt', encoding='utf8') as f:
-#     readme = f.read()
-
-with io.open('odltools/__init__.py', 'rt', encoding='utf8') as f:
-    version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
+with io.open("README.rst", "rt", encoding="utf8") as f:
+    readme = f.read()
 
+with open("requirements.txt") as f:
+    requirements = f.read().splitlines()
 
 setup(
-    name='odltools',
-    version=version,
-    description='OpenDaylight Troubleshooting Tools',
-    url='http://github.com/shague/odltools',
-    author='Sam Hague, Vishal Thapar',
-    author_email='shague@gmail.com, thapar@gmail.com',
-    license='EPL',
-    packages=find_packages(exclude=['*.iml', 'tests*']),
-    install_requires=['requests'],
+    name="odltools",
+    version=__version__,
+    description="NetVirt tools for troubleshooting OpenDaylight and "
+                "OpenStack integration",
+    long_description=readme,
+    long_description_content_type="text/x-rst; charset=UTF-8",
+    url="http://github.com/shague/odltools",
+    author="Sam Hague, Vishal Thapar",
+    author_email="shague@gmail.com, thapar@gmail.com",
+    license="Eclipse Public License",
+    packages=find_packages(exclude=["tests"]),
+    install_requires=requirements,
+    platforms=["All"],
+    python_requires=">=2.7",
+    keywords="development",
     zip_safe=False,
-    classifiers=[
-        'Development Status :: 3 - Alpha',
-        'Intended Audience :: Developers',
-        'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
-        'Topic :: Software Development'
-    ],
-    keywords='development',
-    python_requires='>=2.7'
-)
\ No newline at end of file
+    # entry_points={"console_scripts": ["odltools=odltools.__main__:main"]},
+    classifiers=textwrap.dedent("""
+        Development Status :: 1 - Planning
+        Intended Audience :: Developers
+        License :: OSI Approved :: Eclipse Public License 1.0 (EPL-1.0)
+        Natural Language :: English
+        Operating System :: OS Independent
+        Programming Language :: Python
+        Programming Language :: Python :: 2.7
+        Topic :: Software Development
+        Topic :: Utilities
+        """).strip().splitlines()
+)