Skip to content

Commit ac83395

Browse files
Merge branch 'main' into create-url-dynamically
Signed-off-by: Matt Norton <matt@carrotmanmatt.com>
2 parents 14cb859 + 411f0bf commit ac83395

11 files changed

Lines changed: 643 additions & 515 deletions

File tree

.github/renovate.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727
"enabled": true
2828
},
2929
"packageRules": [
30+
{
31+
"description": "Only update major Python versions manually",
32+
"enabled": false,
33+
"matchPackageNames": [
34+
"python"
35+
]
36+
},
3037
{
3138
"groupName": "pep621",
3239
"matchManagers": [
@@ -58,7 +65,7 @@
5865
]
5966
},
6067
{
61-
"description": "Update frquently changing pre-commit hooks on Tuesday mornings",
68+
"description": "Update frequently changing pre-commit hooks on Tuesday mornings",
6269
"matchManagers": [
6370
"pre-commit"
6471
],

.github/workflows/check-build-deploy.yaml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- uses: actions/checkout@v4
1616

1717
- name: Install uv
18-
uses: astral-sh/setup-uv@v5
18+
uses: astral-sh/setup-uv@v6
1919
with:
2020
enable-cache: true
2121

@@ -39,7 +39,7 @@ jobs:
3939
python-version-file: .python-version
4040

4141
- name: Install uv
42-
uses: astral-sh/setup-uv@v5
42+
uses: astral-sh/setup-uv@v6
4343
with:
4444
enable-cache: true
4545

@@ -75,7 +75,7 @@ jobs:
7575
python-version-file: .python-version
7676

7777
- name: Install uv
78-
uses: astral-sh/setup-uv@v5
78+
uses: astral-sh/setup-uv@v6
7979
with:
8080
enable-cache: true
8181

@@ -101,6 +101,9 @@ jobs:
101101
- name: Run pre-commit
102102
run: uv run -- pre-commit run --all-files --hook-stage manual # TODO: Add GitHub workflows output format
103103

104+
- uses: pre-commit-ci/lite-action@v1.1.0
105+
if: ${{!cancelled()}}
106+
104107
pymarkdown:
105108
runs-on: ubuntu-latest
106109
env:
@@ -117,7 +120,7 @@ jobs:
117120
python-version-file: .python-version
118121

119122
- name: Install uv
120-
uses: astral-sh/setup-uv@v5
123+
uses: astral-sh/setup-uv@v6
121124
with:
122125
enable-cache: true
123126

@@ -144,7 +147,7 @@ jobs:
144147
python-version-file: .python-version
145148

146149
- name: Install uv
147-
uses: astral-sh/setup-uv@v5
150+
uses: astral-sh/setup-uv@v6
148151
with:
149152
enable-cache: true
150153

@@ -180,7 +183,7 @@ jobs:
180183
python-version-file: .python-version
181184

182185
- name: Install uv
183-
uses: astral-sh/setup-uv@v5
186+
uses: astral-sh/setup-uv@v6
184187
with:
185188
enable-cache: true
186189

.gitlint

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,8 @@ ignore = T1,B1,B5,B6
1111
regex = \AMerge\s+[a-f0-9]{8,64}\s+into\s+[a-f0-9]{8,64}\Z
1212
ignore = T1,B5,B6
1313

14+
[ignore-body-lines]
15+
regex = (?i)^Co-Authored-By
16+
1417
[title-must-not-contain-word]
1518
words = fuck,stupid,annoying,rubbish,shit,crap

.pre-commit-config.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ repos:
1111
- id: hadolint
1212

1313
- repo: https://github.com/renovatebot/pre-commit-hooks
14-
rev: 39.227.2
14+
rev: 40.3.4
1515
hooks:
1616
- id: renovate-config-validator
1717
args: [--strict]
1818
stages: [manual]
1919

2020
- repo: https://github.com/python-jsonschema/check-jsonschema
21-
rev: 0.32.1
21+
rev: 0.33.0
2222
hooks:
2323
- id: check-github-workflows
2424

@@ -29,7 +29,7 @@ repos:
2929
- id: gitlint-ci
3030

3131
- repo: https://github.com/gitleaks/gitleaks
32-
rev: v8.24.2
32+
rev: v8.25.1
3333
hooks:
3434
- id: gitleaks
3535

@@ -74,15 +74,15 @@ repos:
7474
stages: [manual]
7575

7676
- repo: https://github.com/astral-sh/ruff-pre-commit
77-
rev: v0.11.4
77+
rev: v0.11.8
7878
hooks:
7979
- id: ruff
8080
args: [--fix]
8181

8282
- id: ruff-format
8383

8484
- repo: https://github.com/astral-sh/uv-pre-commit
85-
rev: 0.6.13
85+
rev: 0.7.2
8686
hooks:
8787
- id: uv-lock
8888
always_run: true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Python Version](https://img.shields.io/badge/Python-3.12-blue?&logo=Python&logoColor=white)](https://python.org/downloads/release/python-3122)
44
[![Pycord Version](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Ftoml-version-finder.carrotmanmatt.com%2Flock%2FCSSUoB%2FTeX-Bot-Py-V2%2Fpy-cord&query=%24.package_version&logo=Discord&label=Pycord&logoColor=white)](https://pycord.dev)
5-
[![Tests Status](https://github.com/CSSUoB/TeX-Bot-Py-V2/actions/workflows/tests.yaml/badge.svg)](https://github.com/CSSUoB/TeX-Bot-Py-V2/actions/workflows/tests.yaml)
5+
[![Tests Status](https://github.com/CSSUoB/TeX-Bot-Py-V2/actions/workflows/check-build-deploy.yaml/badge.svg)](https://github.com/CSSUoB/TeX-Bot-Py-V2/actions/workflows/check-build-deploy.yaml)
66
[![Mypy Status](https://img.shields.io/badge/mypy-checked-%232EBB4E&label=mypy)](https://mypy-lang.org)
77
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://ruff.rs)
88
[![uv](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/uv/main/assets/badge/v0.json)](https://astral.sh/uv)

0 commit comments

Comments
 (0)