Skip to content

Commit b29bdf7

Browse files
committed
Merge branch 'main' into fix-premul-alpha-bytewidth
# Conflicts: # src_c/alphablit.c # src_c/simd_blitters_sse2.c
2 parents 4145fc3 + f46a4b6 commit b29bdf7

File tree

605 files changed

+30751
-16717
lines changed

Some content is hidden

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

605 files changed

+30751
-16717
lines changed

.circleci/config.yml

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

.coderabbit.yaml

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
language: en-US
2+
tone_instructions: ''
3+
early_access: false
4+
enable_free_tier: true
5+
reviews:
6+
profile: chill
7+
request_changes_workflow: false
8+
high_level_summary: false
9+
high_level_summary_placeholder: '@coderabbitai summary'
10+
high_level_summary_in_walkthrough: true
11+
auto_title_placeholder: '@coderabbitai'
12+
auto_title_instructions: ''
13+
review_status: true
14+
commit_status: true
15+
fail_commit_status: false
16+
collapse_walkthrough: true
17+
changed_files_summary: true
18+
sequence_diagrams: true
19+
estimate_code_review_effort: true
20+
assess_linked_issues: true
21+
related_issues: true
22+
related_prs: true
23+
suggested_labels: true
24+
auto_apply_labels: false
25+
suggested_reviewers: true
26+
auto_assign_reviewers: false
27+
poem: false
28+
labeling_instructions: []
29+
path_filters:
30+
- '!src_c/doc/*' # autogenerated C header files
31+
- '!src_c/freetype/*' # freetype vendored files
32+
- '!src_c/include/pythoncapi_compat.h' # vendored python file
33+
- '!docs/LGPL.txt' # license file
34+
- '!docs/licenses/*' # licenses for dependencies
35+
path_instructions: []
36+
abort_on_close: false
37+
disable_cache: false
38+
auto_review:
39+
enabled: true
40+
auto_incremental_review: true
41+
ignore_title_keywords: []
42+
labels: []
43+
drafts: false
44+
base_branches: []
45+
finishing_touches:
46+
docstrings:
47+
enabled: true
48+
unit_tests:
49+
enabled: true
50+
pre_merge_checks:
51+
docstrings:
52+
mode: warning
53+
threshold: 80
54+
title:
55+
mode: warning
56+
requirements: ''
57+
description:
58+
mode: warning
59+
issue_assessment:
60+
mode: warning
61+
tools:
62+
ast-grep:
63+
rule_dirs: []
64+
util_dirs: []
65+
essential_rules: true
66+
packages: []
67+
shellcheck:
68+
enabled: true
69+
ruff:
70+
enabled: true
71+
markdownlint:
72+
enabled: true
73+
github-checks:
74+
enabled: true
75+
timeout_ms: 90000
76+
languagetool:
77+
enabled: true
78+
enabled_rules: []
79+
disabled_rules: []
80+
enabled_categories: []
81+
disabled_categories: []
82+
enabled_only: false
83+
level: default
84+
biome:
85+
enabled: false
86+
hadolint:
87+
enabled: false
88+
swiftlint:
89+
enabled: false
90+
phpstan:
91+
enabled: false
92+
level: default
93+
phpmd:
94+
enabled: false
95+
phpcs:
96+
enabled: false
97+
golangci-lint:
98+
enabled: false
99+
yamllint:
100+
enabled: true
101+
gitleaks:
102+
enabled: true
103+
checkov:
104+
enabled: true
105+
detekt:
106+
enabled: false
107+
eslint:
108+
enabled: false
109+
flake8:
110+
enabled: true
111+
rubocop:
112+
enabled: false
113+
buf:
114+
enabled: false
115+
regal:
116+
enabled: false
117+
actionlint:
118+
enabled: true
119+
pmd:
120+
enabled: false
121+
cppcheck:
122+
enabled: true
123+
semgrep:
124+
enabled: true
125+
circleci:
126+
enabled: false
127+
clippy:
128+
enabled: false
129+
sqlfluff:
130+
enabled: false
131+
prismaLint:
132+
enabled: false
133+
pylint:
134+
enabled: true
135+
oxc:
136+
enabled: false
137+
shopifyThemeCheck:
138+
enabled: false
139+
luacheck:
140+
enabled: false
141+
brakeman:
142+
enabled: false
143+
dotenvLint:
144+
enabled: true
145+
htmlhint:
146+
enabled: false
147+
checkmake:
148+
enabled: true
149+
osvScanner:
150+
enabled: true
151+
chat:
152+
art: true
153+
auto_reply: true
154+
integrations:
155+
jira:
156+
usage: auto
157+
linear:
158+
usage: auto
159+
knowledge_base:
160+
opt_out: false
161+
web_search:
162+
enabled: true
163+
code_guidelines:
164+
enabled: true
165+
filePatterns: []
166+
learnings:
167+
scope: auto
168+
issues:
169+
scope: auto
170+
jira:
171+
usage: auto
172+
project_keys: []
173+
linear:
174+
usage: auto
175+
team_keys: []
176+
pull_requests:
177+
scope: auto
178+
mcp:
179+
usage: auto
180+
disabled_servers: []
181+
code_generation:
182+
docstrings:
183+
language: en-US
184+
path_instructions: []
185+
unit_tests:
186+
path_instructions: []

.gitattributes

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# define files/directories that won't be exported in an sdist
22
# Keep in sync with MANIFEST.in
3-
.circleci/ export-ignore
43
.github/ export-ignore
5-
buildconfig/ci/ export-ignore
64
buildconfig/macdependencies/ export-ignore
75
buildconfig/manylinux-build/ export-ignore
86

.github/ISSUE_TEMPLATE/blank_issue.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: 🗎 Blank Issue
33
about: A blank issue. For those who know what they are doing.
44
title: ''
5-
labels:
5+
labels:
66
assignees: ''
77

8-
---
8+
---

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ assignees: ''
1111

1212
**Environment:**
1313

14-
If possible, please include the output of `pygame.print_debug_info()` from your program in your bug report. It looks something
14+
If possible, please include the output of `pygame.print_debug_info()` from your program in your bug report. It looks something
1515
like this:
1616

1717
```
@@ -33,7 +33,7 @@ Freetype versions: Linked: 2.11.1 Compiled: 2.11.1
3333
Display Driver: windows
3434
Mixer Driver: wasapi
3535
```
36-
If you can't get the debug output, any of the environment details included in it that you do know would be useful
36+
If you can't get the debug output, any of the environment details included in it that you do know would be useful
3737
in diagnosing the issue & helping you.
3838

3939
Other environment details, not included in `print_debug_info()`, that might help:

.github/ISSUE_TEMPLATE/enhancement.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ assignees: ''
99

1010
**Description**
1111

12-
Describe your enhancement, as clearly as possible.
12+
Describe your enhancement, as clearly as possible.

.github/workflows/build-debian-multiarch.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ env:
4444
apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev -y
4545
apt-get install libfreetype6-dev libportmidi-dev fontconfig -y
4646
apt-get install python3-dev python3-pip python3-wheel python3-sphinx -y
47-
pip3 install meson-python --break-system-packages
47+
pip3 install meson-python "sphinx-autoapi<=3.3.2" --break-system-packages
4848
4949
jobs:
5050
build-multiarch:
@@ -65,10 +65,10 @@ jobs:
6565
- { arch: armv7, base_image: 'balenalib/raspberrypi3-debian:bookworm' }
6666

6767
steps:
68-
- uses: actions/checkout@v4.1.7
68+
- uses: actions/checkout@v5.0.0
6969

7070
- name: Build sources and run tests
71-
uses: uraimo/run-on-arch-action@v2.7.2
71+
uses: uraimo/run-on-arch-action@v3.0.1
7272
id: build
7373
with:
7474
arch: ${{ matrix.base_image && 'none' || matrix.arch }}
@@ -96,18 +96,16 @@ jobs:
9696
install: ${{ env.INSTALL_CMD }}
9797

9898
# Build a wheel, install it for running unit tests.
99-
# --no-build-isolation is passed so that preinstalled meson-python can be used
100-
# (done for optimization reasons)
99+
# pip does not know that ninja is installed, and tries to install it again.
100+
# so pass --ignore-dep ninja explicitly
101101
run: |
102-
echo "\nBuilding pygame wheel\n"
103-
pip3 wheel . --no-build-isolation --wheel-dir /artifacts -vvv
104-
echo "\nInstalling wheel\n"
105-
pip3 install --no-index --pre --break-system-packages --find-links /artifacts pygame-ce
102+
echo "\nBuilding and installing pygame wheel\n"
103+
PIP_BREAK_SYSTEM_PACKAGES=1 python3 dev.py --ignore-dep ninja build --wheel /artifacts --lax
106104
echo "\nRunning tests\n"
107105
export SDL_VIDEODRIVER=dummy
108106
export SDL_AUDIODRIVER=disk
109107
python3 -m pygame.tests -v --exclude opengl,music,timing --time_out 300
110-
108+
111109
# Upload the generated files under github actions assets section
112110
- name: Upload dist
113111
uses: actions/upload-artifact@v4
@@ -123,7 +121,7 @@ jobs:
123121
runs-on: ubuntu-22.04
124122
steps:
125123
- name: Download all multiarch artifacts
126-
uses: actions/download-artifact@v4
124+
uses: actions/download-artifact@v5
127125
with:
128126
name: pygame-multiarch-armv7-dist
129127
path: ~/artifacts
@@ -136,7 +134,7 @@ jobs:
136134
done
137135
138136
- name: Test armv7 wheel on armv6
139-
uses: uraimo/run-on-arch-action@v2.7.2
137+
uses: uraimo/run-on-arch-action@v3.0.1
140138
with:
141139
arch: armv6
142140
distro: bookworm

.github/workflows/build-emsdk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
SDKROOT: /opt/python-wasm-sdk
4242

4343
steps:
44-
- uses: actions/checkout@v4.1.7
44+
- uses: actions/checkout@v5.0.0
4545

4646
- name: Regen with latest cython (using system python3)
4747
run: |

0 commit comments

Comments
 (0)