Merge pull request #362 from kmcquade/upgrade-click

Upgrade python click

Author: kmcquade

.gitignore

@@ -28,6 +28,7 @@ __pycache__/
 *.py[cod]
 *$py.class
 env/
+_build/
 build/
 develop-eggs/
 dist/

Makefile

@@ -18,7 +18,7 @@ setup-dev: setup-env
 .PHONY: build-docs
 build-docs: clean virtualenv
 	python3 -m pip install -r docs/requirements.txt
-	mkdocs build
+	mkdocs build --clean --site-dir _build/html --config-file mkdocs.yml
 
 .PHONY: serve-docs
 serve-docs: clean virtualenv
@@ -46,6 +46,7 @@ uninstall:
 clean:
 	rm -rf dist/
 	rm -rf build/
+	rm -rf _build/
 	rm -rf *.egg-info
 	find . -name '*.pyc' -delete
 	find . -name '*.pyo' -delete

docs/library-usage/writing/validate.md

@@ -3,10 +3,14 @@ atomicwrites==1.4.0
 distlib==0.3.1
 filelock==3.0.12
 mkdocs==1.1.2
-mkdocs-material==7.0.6
+mkdocs-material==7.1.4
 mkdocs-material-extensions==1.0.1
 mkdocstrings==0.15.0
-Pygments==2.8.1
-pymdown-extensions==8.1.1
-pytkdocs==0.11.0
-docutils==0.16
+Pygments==2.9.0
+pymdown-extensions==8.2
+pytkdocs==0.11.1
+docutils==0.17.1
+# Trying to see if RTFD needs these
+markdown==3.3.4
+typed-ast==1.4.3
+MarkupSafe==2.0.0

docs/requirements.txt

@@ -55,7 +55,6 @@ nav:
     - Overview: 'library-usage/index.md'
     - "<b>Writing Policies</b>":
       - writing.minimize: 'library-usage/writing/minimize.md'
-      - writing.validate: 'library-usage/writing/validate.md'
       - command.write_policy: 'library-usage/writing/write_policy.md'
     - "<b>Querying the Database</b>":
       - querying.all: 'library-usage/querying/all.md'

mkdocs.yml

@@ -1,21 +1,24 @@
-appdirs==1.4.4
-astroid==2.5.1
-attrs==20.3.0
+# Unit Testing
+pytest==6.2.4
+pylint==2.8.2
+nose==1.3.7
+coverage==5.5
+# Integration tests and tasks
+invoke==1.5.0
+# Security testing
+safety==1.10.3
 bandit==1.7.0
-beautifulsoup4==4.9.3
+# Formatting
 black==20.8b1
-certifi==2020.12.5
-chardet==4.0.0
-click==7.1.2
-contextlib2==0.6.0.post1
-coverage==5.5
+# Other? Maybe this is from the docs? Not sure.
+appdirs==1.4.4
+astroid==2.5.6
+attrs==20.3.0
 dparse==0.5.1
 future==0.18.2
 gitdb==4.0.5
 GitPython==3.1.14
-idna==2.10
 iniconfig==1.1.1
-invoke==1.5.0
 isort==5.8.0
 Jinja2==2.11.3
 joblib==1.0.1
@@ -26,27 +29,19 @@ MarkupSafe==1.1.1
 mccabe==0.6.1
 mypy-extensions==0.4.3
 nltk==3.5
-nose==1.3.7
 packaging==20.9
 pathspec==0.8.1
 pbr==5.5.1
 pluggy==0.13.1
 py==1.10.0
-pylint==2.7.2
 pyparsing==2.4.7
-pytest==6.2.2
-PyYAML==5.4.1
 regex==2021.3.17
 requests==2.25.1
-safety==1.10.3
-schema==0.7.4
 six==1.15.0
-soupsieve==2.2.1
 stevedore==3.3.0
 toml==0.10.2
 tornado==6.1
 tqdm==4.59.0
 typed-ast==1.4.2
 typing-extensions==3.7.4.3
-urllib3==1.26.4
 wrapt==1.12.1

requirements-dev.txt

@@ -1,11 +1,8 @@
+# Command line
+click==8.0.0
+# Web Scraping
 beautifulsoup4==4.9.3
-certifi==2020.12.5
-chardet==4.0.0
-click==7.1.2
-contextlib2==0.6.0.post1
-idna==2.10
-PyYAML==5.4.1
 requests==2.25.1
+# Config files and schema validation
+PyYAML==5.4.1
 schema==0.7.4
-soupsieve==2.2.1
-urllib3==1.26.4

requirements.txt

@@ -10,6 +10,13 @@
     'nose',
     'pytest'
 ]
+REQUIRED_PACKAGES = [
+    'beautifulsoup4',
+    'click',
+    'requests',
+    'schema',
+    'PyYAML',
+]
 PROJECT_URLS = {
     "Documentation": "https://policy-sentry.readthedocs.io/",
     "Code": "https://github.com/salesforce/policy_sentry/",
@@ -48,13 +55,7 @@ def get_description():
     url="https://github.com/salesforce/policy_sentry",
     packages=setuptools.find_packages(exclude=['test*']),
     tests_require=TESTS_REQUIRE,
-    install_requires=[
-        'beautifulsoup4',
-        'click',
-        'requests',
-        'schema',
-        'PyYAML',
-    ],
+    install_requires=REQUIRED_PACKAGES,
     project_urls=PROJECT_URLS,
     classifiers=[
         "Programming Language :: Python :: 3",