diff --git a/README.md b/README.md index b590dc6..ad38d80 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ From the root of the folder: python3 -m venv .venv source .venv/bin/activate pip install -r requirements -python -m scptool.main validate --sourcefiles ./scps --profile yourawsprofile +python -m scpkit.main validate --sourcefiles ./scps --profile yourawsprofile ``` Install as a package ``` diff --git a/scpkit/main.py b/scpkit/main.py index 669ebf0..5aaf27b 100644 --- a/scpkit/main.py +++ b/scpkit/main.py @@ -17,7 +17,7 @@ def main(): arguments = { - k.lstrip('-'): v for k, v in docopt(__doc__, version='SCPtool v0.01').items() + k.lstrip('-'): v for k, v in docopt(__doc__).items() } arguments['scps'] = get_files_in_dir(arguments["sourcefiles"]) diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..93c7b3e --- /dev/null +++ b/setup.cfg @@ -0,0 +1,28 @@ +[metadata] +name = scpkit +author = Aquia +author_email = info@aquia.us +url = https://www.aquia.us +project_urls = + Bug Tracker = https://github.com/aquia-inc/scpkit/issues + Source = https://github.com/aquia-inc/scpkit +description = This package helps consolidate service control policies in AWS +license = Apache License 2.0 +long_description = file: README.md +long_description_content_type = text/markdown +version = 0.1.0 + +[options] +zip_safe = False +include_package_data = True +packages = find: +install_requires = file: requirements.txt + +[options.entry_points] +console_scripts = + scpkit = scpkit.main:main + +[options.packages.find] +exclude = + tests* + my_package.tests* diff --git a/setup.py b/setup.py index e074e8c..6068493 100644 --- a/setup.py +++ b/setup.py @@ -1,27 +1,3 @@ -from setuptools import setup, find_packages -import pkg_resources -import pathlib +from setuptools import setup -import scpkit - -with pathlib.Path("requirements.txt").open() as requirements_txt: - requires = [ str(r) for r in pkg_resources.parse_requirements(requirements_txt) ] - -with open("README.md", "r") as readme: - long_description = readme.read() - -setup( - name = 'scpkit', - version = scpkit.__version__, - author="Aquia", - author_email="info@aquia.us", - url="https://github.com/aquia-inc/scpkit", - license="Apache License 2.0", - long_description=long_description, - long_description_content_type="text/markdown", - packages = find_packages(exclude=['tests*']), - entry_points = { - 'console_scripts': [ 'scpkit=scpkit.main:main'] - }, - install_requires = requires -) \ No newline at end of file +setup()