Skip to content

Commit 8891f4d

Browse files
authored
Merge pull request #263 from cisagov/lineage/skeleton
⚠️ CONFLICT! Lineage pull request for: skeleton
2 parents 901a6d3 + 423710e commit 8891f4d

File tree

15 files changed

+179
-211
lines changed

15 files changed

+179
-211
lines changed

.bandit.yml

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

.flake8

Lines changed: 0 additions & 28 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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ jobs:
422422
- name: Build artifacts
423423
run: python -m build
424424
- name: Upload artifacts
425-
uses: actions/upload-artifact@v4
425+
uses: actions/upload-artifact@v5
426426
with:
427427
name: dist-${{ matrix.python-version }}
428428
path: dist
@@ -511,7 +511,7 @@ jobs:
511511
restore-keys: |
512512
${{ env.BASE_CACHE_KEY }}
513513
- name: Retrieve the built wheel
514-
uses: actions/download-artifact@v5
514+
uses: actions/download-artifact@v6
515515
with:
516516
name: dist-${{ matrix.python-version }}
517517
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: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ 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
@@ -79,7 +79,7 @@ repos:
7979

8080
# Go hooks
8181
- repo: https://github.com/TekWizely/pre-commit-golang
82-
rev: v1.0.0-rc.2
82+
rev: v1.0.0-rc.4
8383
hooks:
8484
# Go Build
8585
- id: go-build-repo-mod
@@ -142,7 +142,9 @@ repos:
142142
name: bandit (tests tree)
143143
files: tests
144144
args:
145-
- --config=.bandit.yml
145+
# Skip "assert used" check since assertions are used
146+
# frequently in pytests.
147+
- --skip=B101
146148
additional_dependencies:
147149
- importlib-metadata<5
148150
- pbr
@@ -160,7 +162,7 @@ repos:
160162
- importlib-metadata<5
161163
- pbr
162164
- repo: https://github.com/psf/black-pre-commit-mirror
163-
rev: 25.1.0
165+
rev: 25.11.0
164166
hooks:
165167
- id: black
166168
- repo: https://github.com/PyCQA/flake8
@@ -172,6 +174,9 @@ repos:
172174
- id: flake8
173175
additional_dependencies:
174176
- flake8-docstrings==1.7.0
177+
# This is necessary to read the flake8 configuration from
178+
# the pyproject.toml file.
179+
- flake8-pyproject==1.2.3
175180
- repo: https://github.com/PyCQA/isort
176181
# isort 5.12.0 dropped support for Python <3.8. Until this project and
177182
# the build.yml workflow can migrate to Python 3.8 or newer we must
@@ -196,7 +201,6 @@ repos:
196201
- types-docopt
197202
- types-pyOpenSSL
198203
- types-requests
199-
- types-setuptools
200204
- types-urllib3
201205
# Override the default arguments to drop the --ignore-missing-imports
202206
# option to enforce a complete mypy configuration.
@@ -235,7 +239,7 @@ repos:
235239
# # version of ansible isn't correctly pinned. The best way forward
236240
# # is to simply comment out this pre-commit hook until we can move
237241
# # to Python >3.7.
238-
# rev: v25.9.0
242+
# rev: v25.11.0
239243
# hooks:
240244
# - id: ansible-lint
241245
# additional_dependencies:
@@ -280,7 +284,7 @@ repos:
280284

281285
# Terraform hooks
282286
- repo: https://github.com/antonbabenko/pre-commit-terraform
283-
rev: v1.100.0
287+
rev: v1.103.0
284288
hooks:
285289
- id: terraform_fmt
286290
- id: terraform_validate

0 commit comments

Comments
 (0)