Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
816d175
Bump crazy-max/ghaction-github-labeler from 5 to 6
dependabot[bot] Mar 2, 2026
3d2fe82
Bump hashicorp/setup-terraform from 3 to 4
dependabot[bot] Mar 2, 2026
2c37bcc
Add E203 to ignore list for flake8
mcdonnnj Aug 30, 2021
0f44a77
Reformat .flake8 configuration
mcdonnnj Aug 30, 2021
57ce573
Add the flake8-bugbear plugin
mcdonnnj Aug 30, 2021
d1356e9
Add dlint plugin for flake8
mcdonnnj Aug 30, 2021
0fd3256
Add the flake8-noqa plugin for flake8
mcdonnnj Aug 30, 2021
f3bf99f
Add pep8-naming plugin for flake8
mcdonnnj Aug 30, 2021
b1503a0
Add flake8-comprehensions plugin for flake8
mcdonnnj Mar 10, 2026
3056053
Adjust flake8 configuration comment format
mcdonnnj Mar 10, 2026
2024429
Install the `go-critic` command instead of `gocritic`
mcdonnnj Mar 10, 2026
ad4cd80
Remove the bandit configuration file
mcdonnnj Mar 10, 2026
175c410
Use `https://` instead of `http://` in referenced URLs
mcdonnnj Mar 11, 2026
a2e2621
Update a reference URL
mcdonnnj Mar 11, 2026
c85cbef
Update ignore comment in the flake8 configuration
mcdonnnj Mar 11, 2026
f094a60
Add pre-commit hook to lock Terraform providers automatically
mcdonnnj Mar 11, 2026
ffe59bd
Ignore a vulnerability originating from pygments
jsf9k Mar 25, 2026
a1cdc78
Correct reference to ticket in TODO comment
jsf9k Mar 25, 2026
71bbac4
Merge pull request #258 from cisagov/ignore-pygments-vuln
jsf9k Mar 25, 2026
2f729bb
Merge pull request #252 from cisagov/dependabot/github_actions/hashic…
jsf9k Mar 25, 2026
391e54b
Merge pull request #251 from cisagov/dependabot/github_actions/crazy-…
jsf9k Mar 25, 2026
811785c
Update pre-commit hook versions
mcdonnnj Mar 25, 2026
df57f2a
Revert version bump of the `ansible-lint` pre-commit hook
mcdonnnj Mar 25, 2026
60c481a
Merge pull request #254 from cisagov/bug/adjust_gocritic_install
mcdonnnj Mar 25, 2026
24bc1e0
Merge pull request #255 from cisagov/improvement/update_flake8_config…
mcdonnnj Mar 25, 2026
5103fb6
Merge pull request #256 from cisagov/improvement/add_pre-commit_hook_…
mcdonnnj Mar 25, 2026
52df901
Merge pull request #259 from cisagov/maintenance/update_pre-commit_hooks
mcdonnnj Mar 25, 2026
72ac03a
Merge pull request #253 from cisagov/improvement/remove_bandit_config…
mcdonnnj Mar 25, 2026
09f90af
Merge https://github.com/cisagov/skeleton-generic into lineage/skeleton
Mar 26, 2026
c55c9d2
Remove scripts that are no longer used
jsf9k Mar 26, 2026
68ea13a
Prefer dict literals ({}) to dict()
jsf9k Mar 26, 2026
5e9c997
Break up an overly long line
jsf9k Mar 26, 2026
0c15a8e
Bump version from 1.0.0 to 1.1.0
jsf9k Mar 26, 2026
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
13 changes: 0 additions & 13 deletions .bandit.yml

This file was deleted.

53 changes: 34 additions & 19 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,25 +1,40 @@
[flake8]
max-line-length = 80

# Select (turn on)
# * Complexity violations reported by mccabe (C) -
# http://flake8.pycqa.org/en/latest/user/error-codes.html#error-violation-codes
# * Documentation conventions compliance reported by pydocstyle (D) -
# http://www.pydocstyle.org/en/stable/error_codes.html
# * Default errors and warnings reported by pycodestyle (E and W) -
# * C: Complexity violations reported by mccabe -
# https://flake8.pycqa.org/en/latest/user/error-codes.html#error-violation-codes
# * C4: Default errors and warnings reported by flake8-comprehensions -
# https://github.com/adamchainz/flake8-comprehensions#rules
# * D: Documentation conventions compliance reported by pydocstyle -
# https://github.com/PyCQA/pydocstyle/blob/master/docs/error_codes.rst
# * DUO: Default errors and warnings reported by dlint -
# https://github.com/dlint-py/dlint/tree/master/docs
# * E: Default errors reported by pycodestyle -
# https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes
# * Default errors reported by pyflakes (F) -
# http://flake8.pycqa.org/en/latest/glossary.html#term-pyflakes
# * Default warnings reported by flake8-bugbear (B) -
# * F: Default errors reported by pyflakes -
# https://flake8.pycqa.org/en/latest/glossary.html#term-pyflakes
# * N: Default errors and warnings reported by pep8-naming -
# https://github.com/PyCQA/pep8-naming#error-codes
# * NQA: Default errors and warnings reported by flake8-noqa -
# https://github.com/plinss/flake8-noqa#error-codes
# * W: Default warnings reported by pycodestyle -
# https://pycodestyle.readthedocs.io/en/latest/intro.html#error-codes
# * B: Default warnings reported by flake8-bugbear -
# https://github.com/PyCQA/flake8-bugbear#list-of-warnings
# * The B950 flake8-bugbear opinionated warning -
# * B950: Bugbear opinionated warning for line too long -
# https://github.com/PyCQA/flake8-bugbear#opinionated-warnings
select = C,D,E,F,W,B,B950
# Ignore flake8's default warning about maximum line length, which has
# a hard stop at the configured value. Instead we use
# flake8-bugbear's B950, which allows up to 10% overage.
#
# Also ignore flake8's warning about line breaks before binary
# operators. It no longer agrees with PEP8. See, for example, here:
# https://github.com/ambv/black/issues/21. Guido agrees here:
# https://github.com/python/peps/commit/c59c4376ad233a62ca4b3a6060c81368bd21e85b.
ignore = E501,W503
select = C,C4,D,DUO,E,F,N,NQA,W,B,B950

# Ignore
# * E203: pycodestyle's default warning about whitespace before ':' because Black enforces
# an equal amount of whitespace around slice operators (':').
# * E501: pycodestyle's default warning about maximum line length, which has a hard stop
# at the configured value. Instead we use flake8-bugbear's B950, which
# allows up to 10% overage.
# * W503: pycodestyle's warning about line breaks before binary operators. It no longer
# agrees with PEP8. See, for example, here:
# https://github.com/ambv/black/issues/21
# Guido agrees here:
# https://github.com/python/peps/commit/c59c4376ad233a62ca4b3a6060c81368bd21e85b
ignore = E203,E501,W503
1 change: 0 additions & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ test:
- any-glob-to-any-file:
# Add any test-related files or paths.
- .ansible-lint
- .bandit.yml
- .flake8
- .isort.cfg
- .mdl_config.yaml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,12 @@ jobs:
- uses: hashicorp/setup-packer@v3
with:
version: ${{ steps.setup-env.outputs.packer-version }}
- uses: hashicorp/setup-terraform@v3
- uses: hashicorp/setup-terraform@v4
with:
terraform_version: ${{ steps.setup-env.outputs.terraform-version }}
- name: Install go-critic
env:
PACKAGE_URL: github.com/go-critic/go-critic/cmd/gocritic
PACKAGE_URL: github.com/go-critic/go-critic/cmd/go-critic
PACKAGE_VERSION: ${{ steps.setup-env.outputs.go-critic-version }}
run: go install ${PACKAGE_URL}@${PACKAGE_VERSION}
- name: Install goimports
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sync-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
- uses: actions/checkout@v6
- name: Sync repository labels
if: success()
uses: crazy-max/ghaction-github-labeler@v5
uses: crazy-max/ghaction-github-labeler@v6
with:
# This is a hideous ternary equivalent so we only do a dry run unless
# this workflow is triggered by the develop branch.
Expand Down
47 changes: 39 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ repos:

# Text file hooks
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.47.0
rev: v0.48.0
hooks:
- id: markdownlint
args:
Expand All @@ -65,7 +65,7 @@ repos:

# GitHub Actions hooks
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.36.2
rev: 0.37.0
hooks:
- id: check-github-actions
- id: check-github-workflows
Expand Down Expand Up @@ -107,7 +107,7 @@ repos:

# Shell script hooks
- repo: https://github.com/scop/pre-commit-shfmt
rev: v3.12.0-2
rev: v3.13.0-1
hooks:
- id: shfmt
args:
Expand All @@ -131,23 +131,26 @@ repos:

# Python hooks
- repo: https://github.com/PyCQA/bandit
rev: 1.9.3
rev: 1.9.4
hooks:
- id: bandit
args:
- --config=.bandit.yml
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 26.1.0
rev: 26.3.1
hooks:
- id: black
- repo: https://github.com/PyCQA/flake8
rev: 7.3.0
hooks:
- id: flake8
additional_dependencies:
- dlint==0.16.0
- flake8-bugbear==25.11.29
- flake8-comprehensions==3.17.0
- flake8-docstrings==1.7.0
- flake8-noqa==1.5.0
- pep8-naming==0.15.1
- repo: https://github.com/PyCQA/isort
rev: 8.0.0
rev: 8.0.1
hooks:
- id: isort
- repo: https://github.com/pre-commit/mirrors-mypy
Expand All @@ -162,6 +165,22 @@ repos:
hooks:
- id: pip-audit
args:
# We have to ignore this vulnerability for now since an
# update for pygments has not yet been released.
#
# In any event, this vulnerability is unlikely to cause us
# any problems since we don't feed any regexes to pygments
# directly. pygments is pulled in as a dependency of
# pytest.
#
# See also:
# - https://nvd.nist.gov/vuln/detail/CVE-2026-4539
# - https://github.com/pygments/pygments/issues/3058
#
# TODO: Remove this when it becomes possible. See
# cisagov/skeleton-generic#257 for more details.
- --ignore-vuln
- CVE-2026-4539
# Add any pip requirements files to scan
- --requirement
- requirements-dev.txt
Expand All @@ -182,6 +201,9 @@ repos:

# Ansible hooks
- repo: https://github.com/ansible/ansible-lint
# We need to stay on this version because we are still using Python 3.13 in
# our GitHub Actions configuration. Later versions require Python 3.14 for
# the hook to run.
rev: v26.1.1
hooks:
- id: ansible-lint
Expand Down Expand Up @@ -212,6 +234,15 @@ repos:
hooks:
- id: terraform_fmt
- id: terraform_validate
# This needs to run after the terraform_validate hook so that any Terraform
# configurations are initialized.
- id: terraform_providers_lock
args:
- --args=-platform=darwin_amd64
- --args=-platform=darwin_arm64
- --args=-platform=linux_amd64
- --args=-platform=linux_arm64
- --hook-config=--mode=always-regenerate-lockfile

# Docker hooks
- repo: https://github.com/IamTheFij/docker-pre-commit
Expand Down
131 changes: 0 additions & 131 deletions project_setup/scripts/iam-to-travis

This file was deleted.

Loading
Loading