Skip to content

Commit 50cdc3f

Browse files
authored
Merge branch 'main' into rm-x
2 parents e3de184 + 64c0c66 commit 50cdc3f

File tree

62 files changed

+21648
-21636
lines changed

Some content is hidden

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

62 files changed

+21648
-21636
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
name: CI
22

3-
on:
4-
pull_request:
5-
branches: [main]
6-
push:
7-
branches: [main]
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
permissions: {}
86

97
concurrency:
108
group: ci-${{ github.ref }}
119
cancel-in-progress: true
1210

11+
env:
12+
FORCE_COLOR: 1
13+
1314
jobs:
1415
quality:
1516
name: Quality checks
1617
runs-on: ubuntu-latest
1718
steps:
1819
- name: Checkout
1920
uses: actions/checkout@v6
21+
with:
22+
persist-credentials: false
2023

2124
- name: Setup Bun
2225
uses: oven-sh/setup-bun@v2
@@ -26,29 +29,17 @@ jobs:
2629
- name: Install dependencies
2730
run: bun install --frozen-lockfile
2831

29-
- name: Lint
30-
run: bunx oxlint src/
31-
32-
- name: Type check
33-
run: bunx astro check
34-
35-
spellcheck:
36-
name: Spell check
37-
runs-on: ubuntu-latest
38-
steps:
39-
- name: Checkout
40-
uses: actions/checkout@v6
41-
42-
- name: Spell check
43-
uses: crate-ci/typos@v1.44.0
32+
- name: Run prek
33+
uses: j178/prek-action@v1
4434

4535
build:
4636
name: Build
4737
runs-on: ubuntu-latest
48-
needs: [quality, spellcheck]
4938
steps:
5039
- name: Checkout
5140
uses: actions/checkout@v6
41+
with:
42+
persist-credentials: false
5243

5344
- name: Setup Bun
5445
uses: oven-sh/setup-bun@v2

.github/workflows/deploy.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,24 @@ on:
77

88
permissions:
99
contents: read
10-
pages: write
11-
id-token: write
1210

1311
concurrency:
1412
group: pages
1513
cancel-in-progress: false
1614

15+
env:
16+
FORCE_COLOR: 1
17+
18+
1719
jobs:
1820
build:
1921
name: Build
2022
runs-on: ubuntu-latest
2123
steps:
2224
- name: Checkout
2325
uses: actions/checkout@v6
26+
with:
27+
persist-credentials: false
2428

2529
- name: Setup Bun
2630
uses: oven-sh/setup-bun@v2
@@ -54,6 +58,9 @@ jobs:
5458
name: Deploy
5559
runs-on: ubuntu-latest
5660
needs: build
61+
permissions:
62+
pages: write
63+
id-token: write
5764
environment:
5865
name: github-pages
5966
url: ${{ steps.deployment.outputs.page_url }}

.github/zizmor.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Configuration for the zizmor static analysis tool, run via prek in CI
2+
# https://docs.zizmor.sh/configuration/
3+
rules:
4+
unpinned-uses:
5+
config:
6+
policies:
7+
"*": ref-pin

.pre-commit-config.yaml

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,53 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v5.0.0
3+
rev: v6.0.0
44
hooks:
5-
- id: trailing-whitespace
6-
args: [--markdown-linebreak-ext=md]
7-
- id: end-of-file-fixer
8-
- id: check-yaml
9-
- id: check-json
10-
- id: check-merge-conflict
115
- id: check-added-large-files
126
args: [--maxkb=500]
7+
- id: check-case-conflict
8+
- id: check-merge-conflict
9+
- id: check-json
10+
- id: check-yaml
11+
- id: end-of-file-fixer
12+
- id: trailing-whitespace
13+
args: [--markdown-linebreak-ext=md]
14+
15+
- repo: https://github.com/python-jsonschema/check-jsonschema
16+
rev: 0.37.0
17+
hooks:
18+
- id: check-dependabot
19+
- id: check-github-workflows
20+
21+
- repo: https://github.com/rhysd/actionlint
22+
rev: v1.7.11
23+
hooks:
24+
- id: actionlint
25+
26+
- repo: https://github.com/zizmorcore/zizmor-pre-commit
27+
rev: v1.23.1
28+
hooks:
29+
- id: zizmor
1330

1431
- repo: https://github.com/crate-ci/typos
15-
rev: v1.32.0
32+
rev: v1.44.0
1633
hooks:
1734
- id: typos
1835

19-
- repo: local
36+
- repo: https://github.com/oxc-project/mirrors-oxlint
37+
rev: v1.55.0
2038
hooks:
21-
- id: lint
22-
name: lint
23-
entry: bun run lint
24-
language: system
25-
pass_filenames: false
39+
- id: oxlint
2640

41+
- repo: local
42+
hooks:
2743
- id: typecheck
2844
name: typecheck
2945
entry: bun run typecheck
3046
language: system
3147
pass_filenames: false
48+
files: ^src/.*\.(ts|tsx|astro)$
49+
50+
- repo: meta
51+
hooks:
52+
- id: check-hooks-apply
53+
- id: check-useless-excludes

content/posts/2012-language-summit-report/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ PEP [3154](http://www.python.org/dev/peps/pep-3154/), mentioned by Lukasz Langa,
6666

6767
* * *
6868

69-
69+
7070
If you have any questions or comments, please post to [python-dev](http://mail.python.org/mailman/listinfo/python-dev). *Thanks to Eric Snow and Senthil Kumaran for contributing to this post.*

content/posts/announcing-defusedxml-fixes-for-xml/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ legacyUrl: /2013/02/announcing-defusedxml-fixes-for-xml.html
1010
---
1111

1212
*The following post was created on behalf of CPython contributor Christian Heimes using a subset of details found [here](https://bitbucket.org/tiran/defusedxml).* Christian Heimes announces the release of his [defusedxml](https://bitbucket.org/tiran/defusedxml) and [defusedexpat](https://bitbucket.org/tiran/defusedexpat) packages to address XML-related security issues which were reported to [security@python.org](mailto:security@python.org) over the last several months. Throughout the development of the patches, the security team has coordinated with other open source projects in order to make this announcement at 1500 UTC on Tuesday February 19. Details will follow once releases of CPython have been organized. ***Note: this post will be updated with more details as they switch from being private to publicly available, including links to the public bug reports on [http://bugs.python.org](http://bugs.python.org/).***
13-
13+
1414
defusedxml on PyPI: [https://pypi.python.org/pypi/defusedxml](https://pypi.python.org/pypi/defusedxml)
1515
defusedexpat on PyPI: [https://pypi.python.org/pypi/defusedexpat](https://pypi.python.org/pypi/defusedexpat)
1616
"XML vulnerabilities" on bug tracker: [http://bugs.python.org/issue17239](http://bugs.python.org/issue17239)
@@ -92,7 +92,7 @@ vulnerabilities and features
9292
6. Library has (limited) XInclude support but requires an additional step to process inclusion.
9393
7. These are features but they may introduce exploitable holes
9494

95-
95+
9696

9797
## [How to avoid XML vulnerabilities](https://bitbucket.org/PSF/defusedxml#id24)
9898

0 commit comments

Comments
 (0)