Skip to content

Commit

Permalink
Merge pull request #23 from cisagov/pull_upstream_changes_2019-11-05
Browse files Browse the repository at this point in the history
Pull upstream changes from skeleton-generic.
  • Loading branch information
mcdonnnj authored Nov 5, 2019
2 parents 7ab251e + 36f1b3b commit 414b6fc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
rev: v2.4.0
hooks:
- id: check-executables-have-shebangs
- id: check-json
Expand All @@ -23,7 +23,7 @@ repos:
- id: requirements-txt-fixer
- id: trailing-whitespace
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.18.0
rev: v0.19.0
hooks:
- id: markdownlint
args:
Expand All @@ -37,13 +37,13 @@ repos:
hooks:
- id: shell-lint
- repo: https://gitlab.com/pycqa/flake8
rev: 3.7.8
rev: 3.7.9
hooks:
- id: flake8
additional_dependencies:
- flake8-docstrings
- repo: https://github.com/asottile/pyupgrade
rev: v1.25.0
rev: v1.25.1
hooks:
- id: pyupgrade
# Run bandit on "tests" tree with a configuration
Expand All @@ -63,11 +63,11 @@ repos:
name: bandit (everything else)
exclude: tests
- repo: https://github.com/python/black
rev: 19.3b0
rev: 19.10b0
hooks:
- id: black
- repo: https://github.com/ansible/ansible-lint.git
rev: v4.1.1a0
rev: v4.1.1a3
hooks:
- id: ansible-lint
# files: molecule/default/playbook.yml
Expand Down
10 changes: 1 addition & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,7 @@ def package_vars(version_file):
py_modules=[splitext(basename(path))[0] for path in glob("src/*.py")],
include_package_data=True,
install_requires=["docopt", "setuptools"],
extras_require={
"test": [
"pre-commit",
"pytest",
"pytest-cov",
"coveralls",
"virtualenv==16.3.0", # see: https://github.com/ansible/ansible-lint/issues/590
]
},
extras_require={"test": ["pre-commit", "pytest", "pytest-cov", "coveralls"]},
# Conveniently allows one to run the CLI tool as `example`
entry_points={"console_scripts": ["example = example.example:main"]},
)

0 comments on commit 414b6fc

Please sign in to comment.