Skip to content

Commit dfb65e9

Browse files
committed
Run pre-commit
1 parent cd8c432 commit dfb65e9

File tree

9 files changed

+35
-21
lines changed

9 files changed

+35
-21
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
### Description of Issue/Question
22

33
### Setup
4+
45
(Please provide relevant configs (Be sure to remove sensitive info).)
56

67
### Steps to Reproduce Issue
8+
79
(Include debug logs if possible, `bootstrap-salt.sh -D`.)
810

911
### Versions and Systems
12+
1013
(`salt --versions-report`, `bootstrap-salt.sh -v`, system type and version,
1114
cloud/VM provider as appropriate.)

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
### What issues does this PR fix or reference?
44

55
### Previous Behavior
6+
67
Remove this section if not relevant
78

89
### New Behavior
10+
911
Remove this section if not relevant

.github/workflows/scripts/update-release-shasum.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python
2-
import sys
32
import pathlib
43
import subprocess
4+
import sys
55

66
THIS_FILE = pathlib.Path(__file__).resolve()
77
CODE_ROOT = THIS_FILE.parent.parent.parent.parent
@@ -25,7 +25,7 @@ def main(version, sha256sum):
2525
if not line.startswith("-"):
2626
out_contents += line
2727
continue
28-
out_contents += "- {}: ``{}``\n".format(version, sha256sum)
28+
out_contents += f"- {version}: ``{sha256sum}``\n"
2929
out_contents += line
3030
updated_version = True
3131
continue

.github/workflows/templates/generate.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/usr/bin/env python3
2-
import datetime
2+
"""
3+
To generate the workflows run the following:
4+
pre-commit run -av generate-actions-workflow
5+
"""
36
import json
47
import os
58
import pathlib
@@ -24,11 +27,12 @@
2427

2528
WINDOWS = [
2629
"windows-2022",
30+
"windows-2025",
2731
]
2832

2933
OSX = [
30-
"macos-13",
3134
"macos-14",
35+
"macos-15-intel",
3236
]
3337

3438
# "amazonlinux-2",
@@ -202,9 +206,10 @@
202206
"ubuntu-2004": "Ubuntu 20.04",
203207
"ubuntu-2204": "Ubuntu 22.04",
204208
"ubuntu-2404": "Ubuntu 24.04",
205-
"macos-13": "macOS 13",
206209
"macos-14": "macOS 14",
210+
"macos-15-intel": "macOS 15 (intel)",
207211
"windows-2022": "Windows 2022",
212+
"windows-2025": "Windows 2025",
208213
}
209214

210215
CONTAINER_SLUG_NAMES = {
@@ -221,9 +226,10 @@
221226
"ubuntu-2004": "ubuntu-20.04",
222227
"ubuntu-2204": "ubuntu-22.04",
223228
"ubuntu-2404": "ubuntu-24.04",
224-
"macos-13": "macos-13",
225-
"macos-14": "macOS 14",
229+
"macos-14": "macos-14",
230+
"macos-15-intel": "macos-15-intel",
226231
"windows-2022": "windows-2022",
232+
"windows-2025": "windows-2025",
227233
}
228234

229235
TIMEOUT_DEFAULT = 20

CODE_OF_CONDUCT.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo
88

99
Examples of behavior that contributes to creating a positive environment include:
1010

11-
* Using welcoming and inclusive language
12-
* Being respectful of differing viewpoints and experiences
13-
* Gracefully accepting constructive criticism
14-
* Focusing on what is best for the community
15-
* Showing empathy towards other community members
11+
- Using welcoming and inclusive language
12+
- Being respectful of differing viewpoints and experiences
13+
- Gracefully accepting constructive criticism
14+
- Focusing on what is best for the community
15+
- Showing empathy towards other community members
1616

1717
Examples of unacceptable behavior by participants include:
1818

19-
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
* Trolling, insulting/derogatory comments, and personal or political attacks
21-
* Public or private harassment
22-
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23-
* Other conduct which could reasonably be considered inappropriate in a professional setting
19+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
- Trolling, insulting/derogatory comments, and personal or political attacks
21+
- Public or private harassment
22+
- Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
- Other conduct which could reasonably be considered inappropriate in a professional setting
2424

2525
## Our Responsibilities
2626

requirements/release.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This file is autogenerated by pip-compile with Python 3.10
33
# by the following command:
44
#
5-
# pip-compile --cert=None --client-cert=None --index-url=None --pip-args=None requirements/release.in
5+
# pip-compile requirements/release.in
66
#
77
annotated-types==0.7.0
88
# via pydantic

tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import json
22
import os
3-
import requests
4-
from packaging.version import Version
53

64
import pytest
5+
import requests
6+
from packaging.version import Version
77

88
API_URL = (
99
"https://packages.broadcom.com/artifactory/api/storage/saltproject-generic/windows"

tools/pre_commit.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
"""
22
These commands are used by pre-commit.
33
"""
4+
45
# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated
56
from __future__ import annotations
67

78
import logging
89
import shutil
910

10-
from ptscripts import Context, command_group
11+
from ptscripts import command_group
12+
from ptscripts import Context
1113

1214

1315
log = logging.getLogger(__name__)

tools/release.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
"""
22
These commands are used to release Salt Bootstrap.
33
"""
4+
45
# pylint: disable=resource-leakage,broad-except,3rd-party-module-not-gated
56
from __future__ import annotations
67

0 commit comments

Comments
 (0)