Skip to content

gh-131261: expat/refresh.sh: Expand list of manual steps - #131359

Merged
encukou merged 3 commits into
python:mainfrom
encukou:expat-update-notes
Mar 18, 2025
Merged

gh-131261: expat/refresh.sh: Expand list of manual steps#131359
encukou merged 3 commits into
python:mainfrom
encukou:expat-update-notes

Conversation

@encukou

@encukouencukou commented Mar 17, 2025

Copy link
Copy Markdown
Member

There's a few manual steps for updating expat; here's a list.
(This is a separate PR as it doesn't need backports.)

We could run make regen-sbom automatically, but it's probably better to do it after checking git diff.

Comment threadTools/build/generate_sbom.py
@encukou
encukou merged commit 51d3099 into python:mainMar 18, 2025
colesbury pushed a commit to colesbury/cpython that referenced this pull request Mar 20, 2025
encukou added a commit to miss-islington/cpython that referenced this pull request Feb 5, 2026
encukou added a commit to miss-islington/cpython that referenced this pull request Feb 5, 2026
@encukou
encukou deleted the expat-update-notes branch February 5, 2026 13:23
@encukou

Copy link
Copy Markdown
MemberAuthor

I'll backport this to make the 2.7.4 update cleaner.

@encukouencukou added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes needs backport to 3.13 bugs and security fixes labels Feb 9, 2026
@miss-islington-app

Copy link
Copy Markdown

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington-app

Copy link
Copy Markdown

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington-app

Copy link
Copy Markdown

Thanks @encukou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app

Copy link
Copy Markdown

Sorry, @encukou, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 51d309988b3041cae20cca89172b4fd825c9a1cc 3.10

@miss-islington-app

Copy link
Copy Markdown

Sorry, @encukou, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 51d309988b3041cae20cca89172b4fd825c9a1cc 3.11

@miss-islington-app

Copy link
Copy Markdown

Sorry, @encukou, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 51d309988b3041cae20cca89172b4fd825c9a1cc 3.13

encukou added a commit to encukou/cpython that referenced this pull request Feb 9, 2026
@bedevere-app

Copy link
Copy Markdown

GH-144625 is a backport of this pull request to the 3.13 branch.

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label Feb 9, 2026
@bedevere-app

Copy link
Copy Markdown

GH-144625 is a backport of this pull request to the 3.13 branch.

encukou added a commit that referenced this pull request Feb 10, 2026
…BOM (GH-131359) (GH-144625)
- generate_sbom.py: Exclude the refresh script from SBOM
- Modules/expat/refresh.sh: Expand the list of manual steps
(cherry picked from commit 51d3099)
@bedevere-bot

Copy link
Copy Markdown

⚠️⚠️⚠️ Buildbot failure ⚠️⚠️⚠️

Hi! The buildbot AMD64 Ubuntu Shared 3.13 (tier-1) has failed when building commit bad4bc4.

What do you need to do:

  1. Don't panic.
  2. Check the buildbot page in the devguide if you don't know what the buildbots are or how they work.
  3. Go to the page of the buildbot that failed (https://buildbot.python.org/#/builders/1450/builds/1567) and take a look at the build logs.
  4. Check if the failure is related to this commit (bad4bc4) or if it is a false positive.
  5. If the failure is related to this commit, please, reflect that on the issue and make a new Pull Request with a fix.

You can take a look at the buildbot page here:

https://buildbot.python.org/#/builders/1450/builds/1567

Failed tests:

  • test_pyrepl

Failed subtests:

  • test_repl_eio - test.test_pyrepl.test_unix_console.TestUnixConsoleEIOHandling.test_repl_eio

Summary of the results of the build (if available):

==

Click to see traceback logs
Traceback (most recent call last):
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/test/test_pyrepl/test_unix_console.py", line 415, in test_repl_eio
_, err = proc.communicate(timeout=support.LONG_TIMEOUT)
~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/subprocess.py", line 1222, in communicate
stdout, stderr =self._communicate(input, endtime, timeout)
~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/subprocess.py", line 2155, in _communicateself._check_timeout(endtime, orig_timeout, stdout, stderr)
~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/subprocess.py", line 1269, in _check_timeoutraise TimeoutExpired(
...<2 lines>...
stderr=b''.join(stderr_seq) if stderr_seq elseNone)
subprocess.TimeoutExpired: Command '['/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/python', '-E', '-S', '/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/test/test_pyrepl/eio_test_script.py']' timed out after 300.0 seconds
Traceback (most recent call last):
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/subprocess.py", line 1140, in __del__
_warn("subprocess %s is still running"%self.pid,
ResourceWarning: subprocess 1745835 is still running
Warning -- Unraisable exception
Exception ignored in: <_io.FileIO name=8 mode='rb' closefd=True>
Traceback (most recent call last):
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/unittest/case.py", line 650, in runwith outcome.testPartExecutor(self):
ResourceWarning: unclosed file <_io.TextIOWrapper name=8 encoding='UTF-8'>
Warning -- Unraisable exception
Exception ignored in: <_io.FileIO name=10 mode='rb' closefd=True>
Traceback (most recent call last):
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/unittest/case.py", line 650, in runwith outcome.testPartExecutor(self):
ResourceWarning: unclosed file <_io.TextIOWrapper name=10 encoding='UTF-8'>
Traceback (most recent call last):
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/subprocess.py", line 1140, in __del__
_warn("subprocess %s is still running"%self.pid,
ResourceWarning: subprocess 1716280 is still running
Warning -- Unraisable exception
Exception ignored in: <_io.FileIO name=8 mode='rb' closefd=True>
Traceback (most recent call last):
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/unittest/case.py", line 650, in runwith outcome.testPartExecutor(self):
ResourceWarning: unclosed file <_io.TextIOWrapper name=8 encoding='UTF-8'>
Warning -- Unraisable exception
Exception ignored in: <_io.FileIO name=10 mode='rb' closefd=True>
Traceback (most recent call last):
File "/srv/buildbot/buildarea/3.13.bolen-ubuntu/build/Lib/unittest/case.py", line 650, in runwith outcome.testPartExecutor(self):
ResourceWarning: unclosed file <_io.TextIOWrapper name=10 encoding='UTF-8'>

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Feb 10, 2026
…from SBOM (pythonGH-131359) (pythonGH-144625)
- generate_sbom.py: Exclude the refresh script from SBOM
- Modules/expat/refresh.sh: Expand the list of manual steps
(cherry picked from commit bad4bc4)
Co-authored-by: Petr Viktorin <encukou@gmail.com>
(cherry picked from commit 51d3099)
encukou added a commit to miss-islington/cpython that referenced this pull request Feb 10, 2026
@encukouencukou removed needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Jul 29, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@encukou@bedevere-bot@gpshead@picnixz@sethmlarson