Merge pull request #316 from kmcquade/fix/change-version

Use version.py to control versions

Author: kmcquade

docs/contributing/versioning.md

@@ -6,14 +6,10 @@ We try to follow [Semantic Versioning](https://semver.org/) as much as possible.
 Version bumps
 -------------
 
-Just edit the `policy_sentry/bin/policy_sentry` file and update the `__version__` variable:
+Just edit the `policy_sentry/bin/version.py` file and update the `__version__` variable:
 
 ```python
-#! /usr/bin/env python
-"""
-    policy_sentry is a tool for generating least-privilege IAM Policies.
-"""
-__version__ = '0.6.3'  # EDIT THIS
+__version__ = '0.11.3'  # EDIT THIS
 ```
 
 The `setup.py` file will automatically pick up the new version from that file for the package info. The `@click.version_option` decorator will also pick that up for the command line.

docs/requirements.txt

@@ -1,71 +1,75 @@
-appdirs==1.4.3
-astroid==2.3.3
+# unique to ReadTheDocs
 atomicwrites==1.4.0
-attrs==19.3.0
+distlib==0.3.1
+filelock==3.0.12
+mkdocs==1.1.2
+mkdocs-material==6.2.3
+mkdocs-material-extensions==1.0.1
+mkdocstrings==0.13.6
+Pygments==2.7.3
+pymdown-extensions==8.1
+pytkdocs==0.9.0
+virtualenv==20.2.2
+virtualenv-clone==0.5.4
+# From the rest of requirements-dev.txt... not sure what is required in order for RTD to auto-include the Python Classes in the library reference section
+appdirs==1.4.4
+astroid==2.4.2
+attrs==20.3.0
 bandit==1.7.0
-beautifulsoup4==4.8.2
-black==19.10b0
-certifi==2020.4.5.1
-chardet==3.0.4
-click==7.1.1
-click-log==0.3.2
-contextlib2==0.5.5
-coverage==5.1
-distlib==0.3.0
+beautifulsoup4==4.9.3
+black==20.8b1
+boto3==1.16.43
+botocore==1.19.43
+certifi==2020.12.5
+chardet==4.0.0
+click==7.1.2
+contextlib2==0.6.0.post1
+coverage==5.3.1
+docutils==0.16
 dparse==0.5.1
-filelock==3.0.12
 future==0.18.2
 gitdb==4.0.5
-GitPython==3.1.2
-homebrew-pypi-poet==0.10.0
-idna==2.8
-importlib-metadata==1.6.0
+GitPython==3.1.11
+idna==2.10
+importlib-metadata==3.3.0
 invoke==1.4.1
-isort==4.3.21
-Jinja2==3.0.0a1
-joblib==0.14.1
-lazy-object-proxy==1.4.3
-livereload==2.6.1
-lunr==0.5.6
-Markdown==3.3.3
-MarkupSafe==2.0.0a1
+isort==5.6.4
+Jinja2==2.11.2
+jmespath==0.10.0
+joblib==1.0.0
+lazy-object-proxy==1.4.*
+livereload==2.6.3
+lunr==0.5.8
+markdown==3.3.3
+MarkupSafe==1.1.1
 mccabe==0.6.1
-mkdocs==1.1
-mkdocs-material==5.1.5
-mkdocs-material-extensions==1.0b2
-mkdocstrings==0.11.0
-more-itertools==8.2.0
+more-itertools==8.6.0
 nltk==3.5
 nose==1.3.7
-packaging==20.3
-pathspec==0.8.0
-pbr==5.4.5
-pipenv==2020.6.2
+packaging==20.8
+pathspec==0.8.1
+pbr==5.5.1
 pluggy==0.13.1
-policy-sentry==0.8.0.5
-py==1.8.1
-Pygments==2.6.1
-pylint==2.5.2
-pymdown-extensions==8.0.1
-pyparsing==3.0.0a1
-pytest==6.1.2
-pytkdocs==0.3.0
+py==1.10.0
+pylint==2.6.0
+pyparsing==2.4.7
+pytest==6.2.1
+python-dateutil==2.8.1
 PyYAML==5.3.1
-regex==2020.5.7
-requests==2.22.0
-safety==1.8.7
-schema==0.7.1
-six==1.14.0
+regex==2020.11.13
+requests==2.25.1
+s3transfer==0.3.3
+safety==1.10.0
+schema==0.7.3
+six==1.15.0
 smmap==3.0.4
-soupsieve==2.0
-stevedore==1.32.0
+soupsieve==2.1
+stevedore==3.3.0
 toml==0.10.2
-tornado==6.0.4
-tqdm==4.46.0
+tornado==6.1
+tqdm==4.55.0
 typed-ast==1.4.1
-urllib3==1.25.10
-virtualenv==20.0.17
-virtualenv-clone==0.5.4
-wcwidth==0.1.9
-wrapt==1.11.2
-zipp==3.1.0
+urllib3==1.26.2
+wcwidth==0.2.5
+wrapt==1.12.1
+zipp==3.4.0

policy_sentry/bin/cli.py

@@ -2,9 +2,9 @@
 """
     Policy Sentry is a tool for generating least-privilege IAM Policies.
 """
-__version__ = "0.11.3"
 import click
 from policy_sentry import command
+from policy_sentry.bin.version import __version__
 
 
 @click.group()

policy_sentry/bin/version.py

@@ -0,0 +1,2 @@
+# pylint: disable=missing-module-docstring
+__version__ = "0.11.3"

requirements-dev.txt

@@ -1,63 +1,61 @@
 appdirs==1.4.4
 astroid==2.4.2
-atomicwrites==1.4.0
-attrs==20.1.0
+attrs==20.3.0
 bandit==1.7.0
-beautifulsoup4==4.9.1
+beautifulsoup4==4.9.3
 black==20.8b1
-certifi==2020.6.20
-chardet==3.0.4
+certifi==2020.12.5
+chardet==4.0.0
 click==7.1.2
 contextlib2==0.6.0.post1
-coverage==5.2.1
+coverage==5.3.1
 dparse==0.5.1
 future==0.18.2
 gitdb==4.0.5
-GitPython==3.1.7
+GitPython==3.1.11
 idna==2.10
-importlib-metadata==1.7.0
+iniconfig==1.1.1
 invoke==1.4.1
-isort==5.4.2
-Jinja2==3.0.0a1
-joblib==0.16.0
-lazy-object-proxy==1.4.3
+isort==5.6.4
+Jinja2==2.11.2
+joblib==1.0.0
+lazy-object-proxy==1.4.*
 livereload==2.6.3
 lunr==0.5.8
 Markdown==3.3.3
-MarkupSafe==2.0.0a1
+MarkupSafe==1.1.1
 mccabe==0.6.1
 mkdocs==1.1.2
-mkdocs-material==5.5.12
-mkdocs-material-extensions==1.0
-mkdocstrings==0.13.0
-more-itertools==8.5.0
+mkdocs-material==6.2.3
+mkdocs-material-extensions==1.0.1
+mkdocstrings==0.13.6
+mypy-extensions==0.4.3
 nltk==3.5
 nose==1.3.7
-packaging==20.4
-pathspec==0.8.0
-pbr==5.4.5
+packaging==20.8
+pathspec==0.8.1
+pbr==5.5.1
 pluggy==0.13.1
-py==1.9.0
-Pygments==2.6.1
+py==1.10.0
+Pygments==2.7.3
 pylint==2.6.0
-pymdown-extensions==8.0.1
-pyparsing==3.0.0a2
-pytest==6.1.2
-pytkdocs==0.7.0
+pymdown-extensions==8.1
+pyparsing==2.4.7
+pytest==6.2.1
+pytkdocs==0.9.0
 PyYAML==5.3.1
-regex==2020.7.14
-requests==2.24.0
-safety==1.9.0
+regex==2020.11.13
+requests==2.25.1
+safety==1.10.0
 schema==0.7.3
 six==1.15.0
 smmap==3.0.4
-soupsieve==2.0.1
-stevedore==3.2.1
+soupsieve==2.1
+stevedore==3.3.0
 toml==0.10.2
-tornado==6.0.4
-tqdm==4.48.2
+tornado==6.1
+tqdm==4.55.0
 typed-ast==1.4.1
-urllib3==1.25.10
-wcwidth==0.2.5
+typing-extensions==3.7.4.3
+urllib3==1.26.2
 wrapt==1.12.1
-zipp==3.1.0

requirements.txt

@@ -1,12 +1,11 @@
-beautifulsoup4==4.9.1
-certifi==2020.6.20
-chardet==3.0.4
+beautifulsoup4==4.9.3
+certifi==2020.12.5
+chardet==4.0.0
 click==7.1.2
 contextlib2==0.6.0.post1
 idna==2.10
-packaging==20.4
 PyYAML==5.3.1
-requests==2.24.0
+requests==2.25.1
 schema==0.7.3
-soupsieve==2.0.1
-urllib3==1.25.10
+soupsieve==2.1
+urllib3==1.26.2

setup.py

@@ -18,7 +18,7 @@ def get_version():
             HERE,
             "policy_sentry",
             "bin",
-            "cli.py"
+            "version.py"
         )
     ).read()
     return VERSION_RE.search(init).group(1)
@@ -45,7 +45,6 @@ def get_description():
     install_requires=[
         'beautifulsoup4',
         'click',
-        'click_log',
         'requests',
         'schema',
         'PyYAML',
@@ -59,5 +58,4 @@ def get_description():
     zip_safe=True,
     keywords='aws iam roles policy policies privileges security',
     python_requires='>=3.6',
-    # scripts=['policy_sentry/bin/policy_sentry'],
 )