diff --git a/jc/jc.py b/jc/jc.py index ebfaf61a..ce1d686c 100755 --- a/jc/jc.py +++ b/jc/jc.py @@ -6,8 +6,9 @@ Main input module import sys import json -import parsers -from parsers import * +import parsers.ifconfig +import parsers.ls +import parsers.netstat pretty = False data = sys.stdin.read() diff --git a/jc/parsers/__init__.py b/jc/parsers/__init__.py index 781c34ec..e69de29b 100644 --- a/jc/parsers/__init__.py +++ b/jc/parsers/__init__.py @@ -1,5 +0,0 @@ -__all__ = [ - 'ifconfig', - 'ls', - 'netstat' -] \ No newline at end of file diff --git a/setup.py b/setup.py index 38e687bd..8e8bc67e 100755 --- a/setup.py +++ b/setup.py @@ -1,25 +1,26 @@ import setuptools -with open("README.md", "r") as f: +with open('README.md', 'r') as f: long_description = f.read() setuptools.setup( - name="jc", - version="0.1", - author="Kelly Brazil", - description="This tool serializes the output of popular command line tools to structured JSON output.", + name='jc', + version='0.1', + author='Kelly Brazil', + description='This tool serializes the output of popular command line tools to structured JSON output.', install_requires=[ - "ifconfigparser" + 'ifconfigparser' ], - license="MIT", + license='MIT', long_description=long_description, - long_description_content_type="text/markdown", + long_description_content_type='text/markdown', python_requires='~=3.4', - url="https://github.com/kellyjonbrazil/jc", + url='https://github.com/kellyjonbrazil/jc', packages=setuptools.find_packages(), + scripts=['jc/jc.py'], classifiers=[ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - "Operating System :: OS Independent", - ], + 'Programming Language :: Python :: 3', + 'License :: OSI Approved :: MIT License', + 'Operating System :: OS Independent', + ] )