Skip to content

Commit

Permalink
Merge pull request #47 from cisagov/lineage/skeleton
Browse files Browse the repository at this point in the history
⚠️ CONFLICT! Lineage pull request for: skeleton
  • Loading branch information
mcdonnnj authored Jul 13, 2020
2 parents 10a796a + 2d88250 commit 2920835
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .isort.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ import_heading_firstparty=cisagov Libraries
known_third_party=docopt,pkg_resources,pytest,schema,setuptools
# These must be manually set to correctly separate them from third party libraries
known_first_party=example

# Run isort under the black profile to align with our other Python linting
profile=black
20 changes: 10 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ default_language_version:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.5.0
rev: v3.1.0
hooks:
- id: check-executables-have-shebangs
- id: check-json
Expand All @@ -27,7 +27,7 @@ repos:
- id: requirements-txt-fixer
- id: trailing-whitespace
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.23.0
rev: v0.23.2
hooks:
- id: markdownlint
args:
Expand All @@ -41,13 +41,13 @@ repos:
hooks:
- id: shell-lint
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.1
rev: 3.8.3
hooks:
- id: flake8
additional_dependencies:
- flake8-docstrings
- repo: https://github.com/asottile/pyupgrade
rev: v2.4.1
rev: v2.7.0
hooks:
- id: pyupgrade
# Run bandit on "tests" tree with a configuration
Expand All @@ -71,20 +71,20 @@ repos:
hooks:
- id: black
- repo: https://github.com/asottile/seed-isort-config
rev: v2.1.1
rev: v2.2.0
hooks:
- id: seed-isort-config
- repo: https://github.com/timothycrosley/isort
rev: 4.3.21
rev: 5.0.7
hooks:
- id: isort
- repo: https://github.com/ansible/ansible-lint.git
rev: v4.3.0a0
rev: v4.3.0a3
hooks:
- id: ansible-lint
# files: molecule/default/playbook.yml
- repo: https://github.com/antonbabenko/pre-commit-terraform.git
rev: v1.30.0
rev: v1.31.0
hooks:
- id: terraform_fmt
# There are ongoing issues with how this command works. This issue
Expand All @@ -104,14 +104,14 @@ repos:
# Terraform 0.13.
# - id: terraform_validate
- repo: https://github.com/IamTheFij/docker-pre-commit
rev: v1.0.1
rev: v2.0.0
hooks:
- id: docker-compose-check
- repo: https://github.com/prettier/prettier
rev: 2.0.5
hooks:
- id: prettier
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.770
rev: v0.782
hooks:
- id: mypy
1 change: 1 addition & 0 deletions tests/test_example.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def test_slow_division():
This test will only be run if --runslow is passed to pytest.
Look in conftest.py to see how this is implemented.
"""
# Standard Python Libraries
import time

result = example.example_div(256, 16)
Expand Down

0 comments on commit 2920835

Please sign in to comment.