Skip to content

Commit 221b38a

Browse files
authored
Merge pull request #33 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents b021bb0 + b5d8240 commit 221b38a

File tree

15 files changed

+157
-199
lines changed

15 files changed

+157
-199
lines changed

.bandit.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.flake8

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/labeler.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
# Add any dependency files used.
1919
- .pre-commit-config.yaml
2020
- requirements*.txt
21-
- setup.py
21+
- pyproject.toml
2222
docker:
2323
- changed-files:
2424
- any-glob-to-any-file:
@@ -45,6 +45,14 @@ python:
4545
- changed-files:
4646
- any-glob-to-any-file:
4747
- "**/*.py"
48+
shell script:
49+
- changed-files:
50+
- any-glob-to-any-file:
51+
# If this project has any shell scripts that do not end in the ".sh"
52+
# extension, add them below.
53+
- "**/*.sh"
54+
- bump-version
55+
- setup-env
4856
terraform:
4957
- changed-files:
5058
- any-glob-to-any-file:
@@ -54,12 +62,9 @@ test:
5462
- any-glob-to-any-file:
5563
# Add any test-related files or paths.
5664
- .ansible-lint
57-
- .bandit.yml
58-
- .flake8
59-
- .isort.cfg
6065
- .mdl_config.yaml
6166
- .yamllint
62-
- pytest.ini
67+
- pyproject.toml
6368
- tests/**
6469
typescript:
6570
- changed-files:

.github/labels.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Rather than breaking up descriptions into multiline strings we disable that
33
# specific rule in yamllint for this file.
44
# yamllint disable rule:line-length
5-
- color: f15a53
5+
- color: ff5850
66
description: Pull requests that update Ansible code
77
name: ansible
88
- color: eb6420
@@ -20,7 +20,7 @@
2020
- color: 0366d6
2121
description: Pull requests that update a dependency file
2222
name: dependencies
23-
- color: 2497ed
23+
- color: 1d63ed
2424
description: Pull requests that update Docker code
2525
name: docker
2626
- color: 5319e7
@@ -47,7 +47,7 @@
4747
- color: fef2c0
4848
description: This issue or pull request is not applicable, incorrect, or obsolete
4949
name: invalid
50-
- color: f1d642
50+
- color: f0db4f
5151
description: Pull requests that update JavaScript code
5252
name: javascript
5353
- color: ce099a
@@ -62,7 +62,7 @@
6262
- color: 02a8ef
6363
description: Pull requests that update Packer code
6464
name: packer
65-
- color: 3772a4
65+
- color: 3776ab
6666
description: Pull requests that update Python code
6767
name: python
6868
- color: ef476c
@@ -71,13 +71,16 @@
7171
- color: d73a4a
7272
description: This issue or pull request addresses a security issue
7373
name: security
74+
- color: 4eaa25
75+
description: Pull requests that update shell scripts
76+
name: shell script
7477
- color: 7b42bc
7578
description: Pull requests that update Terraform code
7679
name: terraform
7780
- color: 00008b
7881
description: This issue or pull request adds or otherwise modifies test code
7982
name: test
80-
- color: 2b6ebf
83+
- color: 2678c5
8184
description: Pull requests that update TypeScript code
8285
name: typescript
8386
- color: 1d76db

.github/workflows/build.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,6 @@ jobs:
219219
- ubuntu-latest
220220
- windows-latest
221221
python-version:
222-
- "3.9"
223222
- "3.10"
224223
- "3.11"
225224
- "3.12"
@@ -347,7 +346,6 @@ jobs:
347346
fail-fast: false
348347
matrix:
349348
python-version:
350-
- "3.9"
351349
- "3.10"
352350
- "3.11"
353351
- "3.12"
@@ -406,7 +404,7 @@ jobs:
406404
- name: Build artifacts
407405
run: python -m build
408406
- name: Upload artifacts
409-
uses: actions/upload-artifact@v4
407+
uses: actions/upload-artifact@v5
410408
with:
411409
name: dist-${{ matrix.python-version }}
412410
path: dist
@@ -433,7 +431,6 @@ jobs:
433431
- ubuntu-latest
434432
- windows-latest
435433
python-version:
436-
- "3.9"
437434
- "3.10"
438435
- "3.11"
439436
- "3.12"
@@ -487,7 +484,7 @@ jobs:
487484
restore-keys: |
488485
${{ env.BASE_CACHE_KEY }}
489486
- name: Retrieve the built wheel
490-
uses: actions/download-artifact@v5
487+
uses: actions/download-artifact@v6
491488
with:
492489
name: dist-${{ matrix.python-version }}
493490
path: dist

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ jobs:
118118

119119
# Initializes the CodeQL tools for scanning.
120120
- name: Initialize CodeQL
121-
uses: github/codeql-action/init@v3
121+
uses: github/codeql-action/init@v4
122122
with:
123123
languages: ${{ matrix.language }}
124124

125125
# Autobuild attempts to build any compiled languages (C/C++, C#, or
126126
# Java). If this step fails, then you should remove it and run the build
127127
# manually (see below).
128128
- name: Autobuild
129-
uses: github/codeql-action/autobuild@v3
129+
uses: github/codeql-action/autobuild@v4
130130

131131
# ℹ️ Command-line programs to run using the OS shell.
132132
# 📚 https://git.io/JvXDl
@@ -140,4 +140,4 @@ jobs:
140140
# make release
141141

142142
- name: Perform CodeQL Analysis
143-
uses: github/codeql-action/analyze@v3
143+
uses: github/codeql-action/analyze@v4

.github/workflows/label-prs.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
permissions:
6060
# Permissions required by actions/labeler
6161
contents: read
62-
issues: write
6362
pull-requests: write
6463
runs-on: ubuntu-latest
6564
steps:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ __pycache__
99
.pytest_cache
1010
.python-version
1111
*.egg-info
12+
build
1213
dist

.isort.cfg

Lines changed: 0 additions & 10 deletions
This file was deleted.

.pre-commit-config.yaml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ repos:
6363

6464
# GitHub Actions hooks
6565
- repo: https://github.com/python-jsonschema/check-jsonschema
66-
rev: 0.33.3
66+
rev: 0.35.0
6767
hooks:
6868
- id: check-github-actions
6969
- id: check-github-workflows
7070

7171
# pre-commit hooks
7272
- repo: https://github.com/pre-commit/pre-commit
73-
rev: v4.3.0
73+
rev: v4.4.0
7474
hooks:
7575
- id: validate_manifest
7676

7777
# Go hooks
7878
- repo: https://github.com/TekWizely/pre-commit-golang
79-
rev: v1.0.0-rc.2
79+
rev: v1.0.0-rc.4
8080
hooks:
8181
# Go Build
8282
- id: go-build-repo-mod
@@ -130,22 +130,24 @@ repos:
130130
# Python hooks
131131
# Run bandit on the "tests" tree with a configuration
132132
- repo: https://github.com/PyCQA/bandit
133-
rev: 1.8.6
133+
rev: 1.9.1
134134
hooks:
135135
- id: bandit
136136
name: bandit (tests tree)
137137
files: tests
138138
args:
139-
- --config=.bandit.yml
139+
# Skip "assert used" check since assertions are used
140+
# frequently in pytests.
141+
- --skip=B101
140142
# Run bandit on everything except the "tests" tree
141143
- repo: https://github.com/PyCQA/bandit
142-
rev: 1.8.6
144+
rev: 1.9.1
143145
hooks:
144146
- id: bandit
145147
name: bandit (everything else)
146148
exclude: tests
147149
- repo: https://github.com/psf/black-pre-commit-mirror
148-
rev: 25.1.0
150+
rev: 25.11.0
149151
hooks:
150152
- id: black
151153
- repo: https://github.com/PyCQA/flake8
@@ -154,20 +156,22 @@ repos:
154156
- id: flake8
155157
additional_dependencies:
156158
- flake8-docstrings==1.7.0
159+
# This is necessary to read the flake8 configuration from
160+
# the pyproject.toml file.
161+
- flake8-pyproject==1.2.3
157162
- repo: https://github.com/PyCQA/isort
158-
rev: 6.0.1
163+
rev: 7.0.0
159164
hooks:
160165
- id: isort
161166
- repo: https://github.com/pre-commit/mirrors-mypy
162-
rev: v1.18.1
167+
rev: v1.18.2
163168
hooks:
164169
- id: mypy
165170
# IMPORTANT: Keep type hinting-related dependencies of the
166171
# mypy pre-commit hook additional_dependencies in sync with
167172
# the dev section of setup.py to avoid discrepancies in type
168173
# checking between environments.
169-
additional_dependencies:
170-
- types-setuptools
174+
additional_dependencies: []
171175
- repo: https://github.com/pypa/pip-audit
172176
rev: v2.9.0
173177
hooks:
@@ -181,13 +185,13 @@ repos:
181185
- --requirement
182186
- requirements.txt
183187
- repo: https://github.com/asottile/pyupgrade
184-
rev: v3.20.0
188+
rev: v3.21.1
185189
hooks:
186190
- id: pyupgrade
187191

188192
# Ansible hooks
189193
- repo: https://github.com/ansible/ansible-lint
190-
rev: v25.9.0
194+
rev: v25.11.0
191195
hooks:
192196
- id: ansible-lint
193197
additional_dependencies:
@@ -231,7 +235,7 @@ repos:
231235

232236
# Terraform hooks
233237
- repo: https://github.com/antonbabenko/pre-commit-terraform
234-
rev: v1.100.0
238+
rev: v1.103.0
235239
hooks:
236240
- id: terraform_fmt
237241
- id: terraform_validate

0 commit comments

Comments
 (0)