Skip to content

Commit a01ffa9

Browse files
author
User
committed
Merge remote-tracking branch 'origin/main' into srh_jinja_support
2 parents 3f56d4e + 1097ac3 commit a01ffa9

317 files changed

Lines changed: 15723 additions & 4767 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.editorconfig

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# http://editorconfig.org
2+
3+
root = true
4+
5+
[*]
6+
indent_style = space
7+
indent_size = 2
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
charset = utf-8
11+
end_of_line = lf
12+
13+
[*.py]
14+
indent_size = 4
15+
max_line_length = 120
16+
17+
[*.yml]
18+
indent_size = 4
19+
20+
[*.md]
21+
indent_size = 4
22+
23+
[*.html]
24+
indent_size = 4
25+
max_line_length = off
26+
27+
[*.js]
28+
max_line_length = off
29+
30+
[*.css]
31+
indent_size = 4
32+
max_line_length = off
33+
34+
# Tests can violate line width restrictions in the interest of clarity.
35+
[**/test_*.py]
36+
max_line_length = off

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# These are supported funding model platforms
22

3-
github: [rmorshea]
3+
github: [archmonger]
44
patreon: # Replace with a single Patreon username
55
open_collective: # Replace with a single Open Collective username
66
ko_fi: # Replace with a single Ko-fi username

.github/pull_request_template.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
## Description
22

3-
A summary of the changes.
3+
<!-- A summary of the changes. -->
44

5-
## Checklist:
5+
## Checklist
66

77
Please update this checklist as you complete each item:
88

@@ -11,4 +11,4 @@ Please update this checklist as you complete each item:
1111
- [ ] Documentation has been updated, if necessary.
1212
- [ ] GitHub Issues closed by this PR have been linked.
1313

14-
<sub>By submitting this pull request you agree that all contributions comply with this project's open source license(s).</sub>
14+
<sub>By submitting this pull request I agree that all contributions comply with this project's open source license(s).</sub>

.github/workflows/codeql.yml

Lines changed: 52 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -12,67 +12,66 @@
1212
name: "CodeQL"
1313

1414
on:
15-
push:
16-
branches: [ "main" ]
17-
pull_request:
18-
# The branches below must be a subset of the branches above
19-
branches: [ "main" ]
20-
schedule:
21-
# Runs at 22:21 on Monday.
22-
- cron: '21 22 * * 1'
15+
push:
16+
branches: ["main"]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: ["main"]
20+
schedule:
21+
# Runs at 22:21 on Monday.
22+
- cron: "21 22 * * 1"
2323

2424
jobs:
25-
analyze:
26-
name: Analyze
27-
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
28-
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
29-
permissions:
30-
actions: read
31-
contents: read
32-
security-events: write
25+
analyze:
26+
name: Analyze
27+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
28+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
29+
permissions:
30+
actions: read
31+
contents: read
32+
security-events: write
3333

34-
strategy:
35-
fail-fast: false
36-
matrix:
37-
language: [ 'javascript', 'python' ]
38-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
39-
# Use only 'java' to analyze code written in Java, Kotlin or both
40-
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
41-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
language: ["javascript", "python"]
38+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
39+
# Use only 'java' to analyze code written in Java, Kotlin or both
40+
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
41+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
4242

43-
steps:
44-
- name: Checkout repository
45-
uses: actions/checkout@v3
43+
steps:
44+
- name: Checkout repository
45+
uses: actions/checkout@v4
4646

47-
# Initializes the CodeQL tools for scanning.
48-
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@v2
50-
with:
51-
languages: ${{ matrix.language }}
52-
# If you wish to specify custom queries, you can do so here or in a config file.
53-
# By default, queries listed here will override any specified in a config file.
54-
# Prefix the list here with "+" to use these queries and those in the config file.
47+
# Initializes the CodeQL tools for scanning.
48+
- name: Initialize CodeQL
49+
uses: github/codeql-action/init@v3
50+
with:
51+
languages: ${{ matrix.language }}
52+
# If you wish to specify custom queries, you can do so here or in a config file.
53+
# By default, queries listed here will override any specified in a config file.
54+
# Prefix the list here with "+" to use these queries and those in the config file.
5555

56-
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
57-
# queries: security-extended,security-and-quality
56+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
57+
# queries: security-extended,security-and-quality
5858

59+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
60+
# If this step fails, then you should remove it and run the build manually (see below)
61+
- name: Autobuild
62+
uses: github/codeql-action/autobuild@v3
5963

60-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
61-
# If this step fails, then you should remove it and run the build manually (see below)
62-
- name: Autobuild
63-
uses: github/codeql-action/autobuild@v2
64+
# ℹ️ Command-line programs to run using the OS shell.
65+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
6466

65-
# ℹ️ Command-line programs to run using the OS shell.
66-
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
67+
# If the Autobuild fails above, remove it and uncomment the following three lines.
68+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
6769

68-
# If the Autobuild fails above, remove it and uncomment the following three lines.
69-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
70+
# - run: |
71+
# echo "Run, Build Application using script"
72+
# ./location_of_script_within_repo/buildscript.sh
7073

71-
# - run: |
72-
# echo "Run, Build Application using script"
73-
# ./location_of_script_within_repo/buildscript.sh
74-
75-
- name: Perform CodeQL Analysis
76-
uses: github/codeql-action/analyze@v2
77-
with:
78-
category: "/language:${{matrix.language}}"
74+
- name: Perform CodeQL Analysis
75+
uses: github/codeql-action/analyze@v3
76+
with:
77+
category: "/language:${{matrix.language}}"
Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
11
name: Publish Develop Docs
2+
23
on:
34
push:
45
branches:
56
- main
67
jobs:
7-
deploy:
8+
publish-develop-docs:
89
runs-on: ubuntu-latest
910
steps:
10-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1112
with:
1213
fetch-depth: 0
13-
- uses: actions/setup-python@v4
14+
- uses: oven-sh/setup-bun@v2
15+
with:
16+
bun-version: latest
17+
- uses: actions/setup-python@v5
1418
with:
1519
python-version: 3.x
16-
- run: pip install -r requirements/build-docs.txt
17-
- name: Publish Develop Docs
20+
- name: Install dependencies
21+
run: pip install hatch
22+
- name: Configure Git
1823
run: |
1924
git config user.name github-actions
20-
git config user.email github-actions@github.com
21-
mike deploy --push develop
25+
git config user.email github-actions@github.com
26+
- name: Publish Develop Docs
27+
run: hatch run docs:deploy_develop
28+
concurrency:
29+
group: publish-docs
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Publish Latest Docs
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
publish-latest-docs:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
with:
13+
fetch-depth: 0
14+
- uses: oven-sh/setup-bun@v2
15+
with:
16+
bun-version: latest
17+
- uses: actions/setup-python@v5
18+
with:
19+
python-version: 3.x
20+
- name: Install dependencies
21+
run: pip install hatch
22+
- name: Configure Git
23+
run: |
24+
git config user.name github-actions
25+
git config user.email github-actions@github.com
26+
- name: Publish ${{ github.event.release.name }} Docs
27+
run: hatch run docs:deploy_latest ${{ github.ref_name }}
28+
concurrency:
29+
group: publish-docs

.github/workflows/publish-py.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Publish Python
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
publish-python:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: oven-sh/setup-bun@v2
13+
with:
14+
bun-version: latest
15+
- name: Set up Python
16+
uses: actions/setup-python@v5
17+
with:
18+
python-version: "3.x"
19+
- name: Install dependencies
20+
run: pip install hatch
21+
- name: Build Package
22+
run: hatch build --clean
23+
- name: Publish to PyPI
24+
env:
25+
HATCH_INDEX_USER: ${{ secrets.PYPI_USERNAME }}
26+
HATCH_INDEX_AUTH: ${{ secrets.PYPI_PASSWORD }}
27+
run: hatch publish --yes

.github/workflows/publish-release-docs.yml

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

.github/workflows/test-docs.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,26 @@ on:
77
pull_request:
88
branches:
99
- main
10-
schedule:
11-
- cron: "0 0 * * *"
1210

1311
jobs:
1412
docs:
1513
runs-on: ubuntu-latest
1614
steps:
17-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1816
with:
1917
fetch-depth: 0
20-
- uses: actions/setup-python@v4
18+
- uses: oven-sh/setup-bun@v2
19+
with:
20+
bun-version: latest
21+
- uses: actions/setup-python@v5
2122
with:
2223
python-version: 3.x
24+
- name: Install Python Dependencies
25+
run: pip install hatch
26+
# DISABLED DUE TO DJANGO DOCS CONSTANTLY THROWING 429 ERRORS
27+
# - name: Check documentation links
28+
# run: hatch run docs:linkcheck
2329
- name: Check docs build
24-
run: |
25-
pip install -r requirements/build-docs.txt
26-
linkcheckMarkdown docs/ -v -r
27-
linkcheckMarkdown README.md -v -r
28-
linkcheckMarkdown CHANGELOG.md -v -r
29-
mkdocs build --strict
30+
run: hatch run docs:build
3031
- name: Check docs examples
31-
run: |
32-
pip install -r requirements/check-types.txt
33-
pip install -r requirements/check-style.txt
34-
mypy --show-error-codes docs/python/
35-
black docs/python/ --check
36-
ruff check docs/python/
32+
run: hatch fmt docs --check

0 commit comments

Comments
 (0)