Skip to content

Commit a726c5d

Browse files
authored
Merge branch 'main' into fix-gh-153854-imaplib-time2internaldate
2 parents 27084f9 + d478cf8 commit a726c5d

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

‎Lib/test/test_curses.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,6 +1364,7 @@ def test_putwin(self):
13641364
self.assertEqual(win.getmaxyx(), (5, 12))
13651365
self.assertEqual(win.instr(2, 0), b' Lorem ipsum')
13661366

1367+
@requires_curses_func('scr_dump')
13671368
def test_scr_dump(self):
13681369
# Test scr_dump(), scr_restore(), scr_init() and scr_set().
13691370
# scr_dump() writes the virtual screen to a named file; the other three
@@ -1722,6 +1723,9 @@ def test_state_getters(self):
17221723
('notimeout', 'is_notimeout'),
17231724
('scrollok', 'is_scrollok'),
17241725
]:
1726+
# is_keypad()/is_leaveok() are not available in every curses build.
1727+
if not hasattr(stdscr, getter):
1728+
continue
17251729
getattr(stdscr, setter)(True)
17261730
self.assertIs(getattr(stdscr, getter)(), True)
17271731
getattr(stdscr, setter)(False)

‎Mac/BuildScript/build-installer.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ def library_recipes():
264264
tk_patches = ['backport_gh71383_fix.patch', 'tk868_on_10_8_10_9.patch', 'backport_gh110950_fix.patch']
265265

266266
else:
267-
tcl_tk_ver='9.0.3'
268-
tcl_checksum='2537ba0c86112c8c953f7c09d33f134dd45c0fb3a71f2d7f7691fd301d2c33a6'
267+
tcl_tk_ver='9.0.4'
268+
tcl_checksum='d0aed49230bc02a65c1e0229e65f34590a4b037ec40d546f32573b467f7551ea'
269269

270-
tk_checksum='bf344efadb618babb7933f69275620f72454d1c8220130da93e3f7feb0efbf9b'
270+
tk_checksum='d7a146d2917eb8b5cc95276dbf0e3d03c7464d2b19c1675357857c989301dbb4'
271271
tk_patches = []
272272

273273

@@ -359,13 +359,14 @@ def library_recipes():
359359
),
360360
),
361361
dict(
362-
name="SQLite 3.53.2",
363-
url="https://www.sqlite.org/2026/sqlite-autoconf-3530200.tar.gz",
364-
checksum="588ad51949419a56ebe81fe56193d510c559eb94c9a57748387860b5d3069316",
362+
name="SQLite 3.53.3",
363+
url="https://www.sqlite.org/2026/sqlite-autoconf-3530300.tar.gz",
364+
checksum="c917d7db16648ec95f714974ace5e5dcf46b7dc70e26600a0a102a3141125db0",
365365
extra_cflags=('-Os '
366366
'-DSQLITE_ENABLE_FTS5 '
367367
'-DSQLITE_ENABLE_FTS4 '
368368
'-DSQLITE_ENABLE_FTS3_PARENTHESIS '
369+
'-DSQLITE_ENABLE_PERCENTILE '
369370
'-DSQLITE_ENABLE_RTREE '
370371
'-DSQLITE_OMIT_AUTOINIT '
371372
'-DSQLITE_TCL=0 '
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Update macOS installer builds to SQLite 3.53.3. Enable median() and
2+
percentile() functions.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Update macOS installer to use Tcl/Tk 9.0.4.

0 commit comments

Comments
 (0)