Skip to content

⚠️ CONFLICT! Lineage pull request for: skeleton #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 8, 2020
Merged

⚠️ CONFLICT! Lineage pull request for: skeleton #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
332e5a7
Run pre-commit autoupdate
mcdonnnj Sep 3, 2020
3e9441c
Update CODEOWNERS to resolve #50
mcdonnnj Sep 3, 2020
ae4aa12
Update lint job to resolve #49
mcdonnnj Sep 3, 2020
d8f14e8
Sort .gitignore while I'm here
mcdonnnj Sep 3, 2020
1541144
Merge pull request #51 from cisagov/pre-commit_updates
mcdonnnj Sep 4, 2020
4e1cec7
Resolve Lineage conflicts.
dav3r Sep 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
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
* @dav3r @felddy @hillaryj @jsf9k @mcdonnnj
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added us all back in as code owners here- we can pare the list down again in the future whenever lineage is updated to notify @cisagov/team-ois about all PRs. Until then, this will minimize the chances that PRs for this repository slip through the cracks.

1 change: 1 addition & 0 deletions .github/workflows/build.yml
View file
Open in desktop
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
16 changes: 8 additions & 8 deletions .pre-commit-config.yaml
View file
Open in desktop
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
- repo: https://github.com/PyCQA/bandit
Expand All @@ -57,7 +57,7 @@ repos:
args:
- --config=.bandit.yml
- repo: https://github.com/python/black
rev: 19.10b0
rev: 20.8b1
hooks:
- id: black
# Disabling seed-isort-config in this project (development-guide) since it
Expand All @@ -67,16 +67,16 @@ repos:
# 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 @@ -100,7 +100,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