Skip to content

Commit

Permalink
Merge pull request #49 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 Sep 6, 2020
2 parents f491f92 + 26b66e4 commit 3ae99f8
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# the repo. Unless a later match takes precedence,
# these owners will be requested for review when someone
# opens a pull request.
* @dav3r @felddy @hillaryj @jsf9k @mcdonnnj @cisagov/team-ois
* @dav3r @felddy @hillaryj @jsf9k @mcdonnnj
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
${{ env.PRE_COMMIT_CACHE_DIR }}
key: "lint-${{ runner.os }}-py${{ env.PY_VERSION }}-\
${{ hashFiles('**/requirements-test.txt') }}-\
${{ hashFiles('**/requirements.txt') }}-\
${{ hashFiles('**/.pre-commit-config.yaml') }}"
restore-keys: |
lint-${{ runner.os }}-py${{ env.PY_VERSION }}-
Expand Down Expand Up @@ -58,7 +59,8 @@ jobs:
with:
path: ${{ env.PIP_CACHE_DIR }}
key: "test-${{ runner.os }}-py${{ matrix.python-version }}-\
${{ hashFiles('**/requirements-test.txt') }}"
${{ hashFiles('**/requirements-test.txt') }}-\
${{ hashFiles('**/requirements.txt') }}"
restore-keys: |
test-${{ runner.os }}-py${{ matrix.python-version }}-
test-${{ runner.os }}-
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*.egg-info
__pycache__
.coverage
.mypy_cache
.pytest_cache
.python-version
__pycache__
*.egg-info
16 changes: 8 additions & 8 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: v3.1.0
rev: v3.2.0
hooks:
- id: check-executables-have-shebangs
- id: check-json
Expand Down Expand Up @@ -33,7 +33,7 @@ repos:
args:
- --config=.mdl_config.json
- repo: https://github.com/adrienverge/yamllint
rev: v1.23.0
rev: v1.24.2
hooks:
- id: yamllint
- repo: https://github.com/detailyang/pre-commit-shell
Expand All @@ -47,7 +47,7 @@ repos:
additional_dependencies:
- flake8-docstrings
- repo: https://github.com/asottile/pyupgrade
rev: v2.7.0
rev: v2.7.2
hooks:
- id: pyupgrade
# Run bandit on "tests" tree with a configuration
Expand All @@ -67,24 +67,24 @@ repos:
name: bandit (everything else)
exclude: tests
- repo: https://github.com/python/black
rev: 19.10b0
rev: 20.8b1
hooks:
- id: black
- repo: https://github.com/asottile/seed-isort-config
rev: v2.2.0
hooks:
- id: seed-isort-config
- repo: https://github.com/timothycrosley/isort
rev: 5.0.7
rev: 5.5.0
hooks:
- id: isort
- repo: https://github.com/ansible/ansible-lint.git
rev: v4.3.0a3
rev: v4.3.4
hooks:
- id: ansible-lint
# files: molecule/default/playbook.yml
- repo: https://github.com/antonbabenko/pre-commit-terraform.git
rev: v1.31.0
rev: v1.37.0
hooks:
- id: terraform_fmt
# There are ongoing issues with how this command works. This issue
Expand All @@ -108,7 +108,7 @@ repos:
hooks:
- id: docker-compose-check
- repo: https://github.com/prettier/prettier
rev: 2.0.5
rev: 2.1.1
hooks:
- id: prettier
- repo: https://github.com/pre-commit/mirrors-mypy
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-e .
--editable .
wheel

0 comments on commit 3ae99f8

Please sign in to comment.