8000 Merge branch 'main' into add-warning-options-and-include-in-check-war… · python/cpython@d0ea15e · GitHub
[go: up one dir, main page]
Skip to content

Commit d0ea15e

Browse files
nohlsonnohlson
committed
Merge branch 'main' into add-warning-options-and-include-in-check-warnings
2 parents b747bb0 + f84754b commit d0ea15e

26 files changed

+913
-584
lines changed

‎.github/workflows/reusable-change-detection.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,18 @@ jobs:
126126
.github/workflows/reusable-docs.yml
127127
format: csv # works for paths with spaces
128128
- name: Check for docs changes
129+
# We only want to run this on PRs when related files are changed,
130+
# or when user triggers manual workflow run.
129131
if: >-
130-
github.event_name == 'pull_request'
131-
&& steps.changed-docs-files.outputs.added_modified_renamed != ''
132+
(
133+
github.event_name == 'pull_request'
134+
&& steps.changed-docs-files.outputs.added_modified_renamed != ''
135+
) || github.event_name == 'workflow_dispatch'
132136
id: docs-changes
133137
run: |
134138
echo "run-docs=true" >> "${GITHUB_OUTPUT}"
135139
- name: Get a list of the MSI installer-related files
136-
if: >-
137-
github.event_name == 'pull_request'
140+
if: github.event_name == 'pull_request'
138141
id: changed-win-msi-files
139142
uses: Ana06/get-changed-files@v2.3.0
140143
with:
@@ -143,10 +146,13 @@ jobs:
143146
.github/workflows/reusable-windows-msi.yml
144147
format: csv # works for paths with spaces
145148
- name: Check for changes in MSI installer-related files
149+
# We only want to run this on PRs when related files are changed,
150+
# or when user triggers manual workflow run.
146151
if: >-
147-
steps.changed-win-msi-files.outputs.added_modified_renamed != ''
152+
(
153+
github.event_name == 'pull_request'
154+
&& steps.changed-win-msi-files.outputs.added_modified_renamed != ''
155+
) || github.event_name == 'workflow_dispatch'
148156
id: win-msi-changes
149157
run: |
150158
echo "run-win-msi=true" >> "${GITHUB_OUTPUT}"
151-
152-
...

‎.github/workflows/reusable-docs.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ jobs:
2525
- name: 'Check out latest PR branch commit'
2626
uses: actions/checkout@v4
2727
with:
28-
ref: ${{ github.event.pull_request.head.sha }}
28+
ref: >-
29+
${{
30+
github.event_name == 'pull_request'
31+
&& github.event.pull_request.head.sha
32+
|| ''
33+
}}
2934
# Adapted from https://github.com/actions/checkout/issues/520#issuecomment-1167205721
3035
- name: 'Fetch commits to get branch diff'
36+
if: github.event_name == 'pull_request'
3137
run: |
3238
# Fetch enough history to find a common ancestor commit (aka merge-base):
3339
git fetch origin ${{ env.refspec_pr }} --depth=$(( ${{ github.event.pull_request.commits }} + 1 )) \

‎Doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ pydoc-topics: build
144144

145145
.PHONY: gettext
146146
gettext: BUILDER = gettext
147-
gettext: SPHINXOPTS += '-d build/doctrees-gettext'
147+
gettext: SPHINXOPTS += -d build/doctrees-gettext
148148
gettext: build
149149

150150
.PHONY: htmlview

‎Include/internal/pycore_opcode_metadata.h

Lines changed: 17 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Include/internal/pycore_symtable.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ extern PyObject* _Py_Mangle(PyObject *p, PyObject *name);
171171
*/
172172
#define SCOPE_OFFSET 12
173173
#define SCOPE_MASK (DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL)
174+
#define SYMBOL_TO_SCOPE(S) (((S) >> SCOPE_OFFSET) & SCOPE_MASK)
174175

175176
#define LOCAL 1
176177
#define GLOBAL_EXPLICIT 2

0 commit comments

Comments
 (0)
0