Skip to content

Commit 73ec915

Browse files
hugovkhugovk
committed
Merge remote-tracking branch 'upstream/main'
2 parents 75078aa + a53a38b commit 73ec915

File tree

6 files changed

+48
-56
lines changed

6 files changed

+48
-56
lines changed

‎cpython-unix/build-cpython.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ pushd pip-tmp
5858
unzip "${PIP_WHEEL}"
5959
rm -f "${PIP_WHEEL}"
6060

61-
patch -p1 -i ${ROOT}/patch-pip-static-binary.patch
62-
6361
zip -r "${PIP_WHEEL}" *
6462
popd
6563
rm -rf pip-tmp
@@ -858,7 +856,8 @@ def fix_shebang(full):
858856
859857
lines.extend([
860858
b"#!/bin/sh\n",
861-
b'"exec" "\$(dirname \$0)/python${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}" "\$0" "\$@"\n',
859+
b"'''exec' \"\$(dirname -- \"\$(realpath -- \"\$0\")\")/python${PYTHON_MAJMIN_VERSION}${PYTHON_BINARY_SUFFIX}\" \"\$0\" \"\$@\"\n",
860+
b"' '''\n",
862861
])
863862
864863
lines.extend(fh)

‎cpython-unix/build.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,16 @@
5151
EXTENSION_MODULES = SUPPORT / "extension-modules.yml"
5252
TARGETS_CONFIG = SUPPORT / "targets.yml"
5353

54-
LINUX_ALLOW_SYSTEM_LIBRARIES = {"c", "crypt", "dl", "m", "pthread", "rt", "util"}
54+
LINUX_ALLOW_SYSTEM_LIBRARIES = {
55+
"c",
56+
"crypt",
57+
"dl",
58+
"m",
59+
"pthread",
60+
"rt",
61+
"util",
62+
"atomic",
63+
}
5564
MACOS_ALLOW_SYSTEM_LIBRARIES = {"dl", "m", "pthread"}
5665
MACOS_ALLOW_FRAMEWORKS = {"CoreFoundation"}
5766

‎cpython-unix/patch-pip-static-binary.patch‎

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

‎pythonbuild/downloads.py‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -35,46 +35,46 @@
3535
"license_file": "LICENSE.bzip2.txt",
3636
},
3737
"cpython-3.9": {
38-
"url": "https://www.python.org/ftp/python/3.9.20/Python-3.9.20.tar.xz",
39-
"size": 19648968,
40-
"sha256": "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c",
41-
"version": "3.9.20",
38+
"url": "https://www.python.org/ftp/python/3.9.21/Python-3.9.21.tar.xz",
39+
"size": 19647056,
40+
"sha256": "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1",
41+
"version": "3.9.21",
4242
"licenses": ["Python-2.0", "CNRI-Python"],
4343
"license_file": "LICENSE.cpython.txt",
4444
"python_tag": "cp39",
4545
},
4646
"cpython-3.10": {
47-
"url": "https://www.python.org/ftp/python/3.10.15/Python-3.10.15.tar.xz",
48-
"size": 19596540,
49-
"sha256": "aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79",
50-
"version": "3.10.15",
47+
"url": "https://www.python.org/ftp/python/3.10.16/Python-3.10.16.tar.xz",
48+
"size": 19610392,
49+
"sha256": "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1",
50+
"version": "3.10.16",
5151
"licenses": ["Python-2.0", "CNRI-Python"],
5252
"license_file": "LICENSE.cpython.txt",
5353
"python_tag": "cp310",
5454
},
5555
"cpython-3.11": {
56-
"url": "https://www.python.org/ftp/python/3.11.10/Python-3.11.10.tar.xz",
57-
"size": 20067656,
58-
"sha256": "07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372",
59-
"version": "3.11.10",
56+
"url": "https://www.python.org/ftp/python/3.11.11/Python-3.11.11.tar.xz",
57+
"size": 20085792,
58+
"sha256": "2a9920c7a0cd236de33644ed980a13cbbc21058bfdc528febb6081575ed73be3",
59+
"version": "3.11.11",
6060
"licenses": ["Python-2.0", "CNRI-Python"],
6161
"license_file": "LICENSE.cpython.txt",
6262
"python_tag": "cp311",
6363
},
6464
"cpython-3.12": {
65-
"url": "https://www.python.org/ftp/python/3.12.7/Python-3.12.7.tar.xz",
66-
"size": 20444032,
67-
"sha256": "24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550",
68-
"version": "3.12.7",
65+
"url": "https://www.python.org/ftp/python/3.12.8/Python-3.12.8.tar.xz",
66+
"size": 20489808,
67+
"sha256": "c909157bb25ec114e5869124cc2a9c4a4d4c1e957ca4ff553f1edc692101154e",
68+
"version": "3.12.8",
6969
"licenses": ["Python-2.0", "CNRI-Python"],
7070
"license_file": "LICENSE.cpython.txt",
7171
"python_tag": "cp312",
7272
},
7373
"cpython-3.13": {
74-
"url": "https://www.python.org/ftp/python/3.13.0/Python-3.13.0.tar.xz",
75-
"size": 22532980,
76-
"sha256": "086de5882e3cb310d4dca48457522e2e48018ecd43da9cdf827f6a0759efb07d",
77-
"version": "3.13.0",
74+
"url": "https://www.python.org/ftp/python/3.13.1/Python-3.13.1.tar.xz",
75+
"size": 22589692,
76+
"sha256": "9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9",
77+
"version": "3.13.1",
7878
"licenses": ["Python-2.0", "CNRI-Python"],
7979
"license_file": "LICENSE.cpython.txt",
8080
"python_tag": "cp313",
@@ -262,10 +262,10 @@
262262
"version": "0.13.1",
263263
},
264264
"pip": {
265-
"url": "https://files.pythonhosted.org/packages/e7/54/0c1c068542cee73d8863336e974fc881e608d0170f3af15d0c0f28644531/pip-24.1.2-py3-none-any.whl",
266-
"size": 1824406,
267-
"sha256": "7cd207eed4c60b0f411b444cd1464198fe186671c323b6cd6d433ed80fc9d247",
268-
"version": "24.1.2",
265+
"url": "https://files.pythonhosted.org/packages/ef/7d/500c9ad20238fcfcb4cb9243eede163594d7020ce87bd9610c9e02771876/pip-24.3.1-py3-none-any.whl",
266+
"size": 1822182,
267+
"sha256": "3790624780082365f47549d032f3770eeb2b1e8bd1f7b2e02dace1afa361b4ed",
268+
"version": "24.3.1",
269269
},
270270
"readline": {
271271
"url": "https://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz",
@@ -277,18 +277,18 @@
277277
"license_file": "LICENSE.readline.txt",
278278
},
279279
"setuptools": {
280-
"url": "https://files.pythonhosted.org/packages/ff/ae/f19306b5a221f6a436d8f2238d5b80925004093fa3edea59835b514d9057/setuptools-75.1.0-py3-none-any.whl",
281-
"size": 1248506,
282-
"sha256": "35ab7fd3bcd95e6b7fd704e4a1539513edad446c097797f2985e0e4b960772f2",
283-
"version": "75.1.0",
280+
"url": "https://files.pythonhosted.org/packages/55/21/47d163f615df1d30c094f6c8bbb353619274edccf0327b185cc2493c2c33/setuptools-75.6.0-py3-none-any.whl",
281+
"size": 1224032,
282+
"sha256": "ce74b49e8f7110f9bf04883b730f4765b774ef3ef28f722cce7c273d253aaf7d",
283+
"version": "75.6.0",
284284
},
285285
# Remember to update verify_distribution.py when version changed.
286286
"sqlite": {
287-
"url": "https://www.sqlite.org/2024/sqlite-autoconf-3460100.tar.gz",
288-
"size": 3265571,
289-
"sha256": "67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071",
290-
"version": "3460100",
291-
"actual_version": "3.46.1.0",
287+
"url": "https://www.sqlite.org/2024/sqlite-autoconf-3470100.tar.gz",
288+
"size": 3328564,
289+
"sha256": "416a6f45bf2cacd494b208fdee1beda509abda951d5f47bc4f2792126f01b452",
290+
"version": "3470100",
291+
"actual_version": "3.47.1.0",
292292
"library_names": ["sqlite3"],
293293
"licenses": [],
294294
"license_file": "LICENSE.sqlite.txt",

‎src/validation.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ const ELF_ALLOWED_LIBRARIES: &[&str] = &[
6868
"libpthread.so.0",
6969
"librt.so.1",
7070
"libutil.so.1",
71+
"libatomic.so.1",
7172
];
7273

7374
const PE_ALLOWED_LIBRARIES: &[&str] = &[
@@ -1487,8 +1488,7 @@ fn validate_extension_modules(
14871488
wanted.extend(GLOBAL_EXTENSIONS_LINUX_PRE_3_13);
14881489
}
14891490

1490-
if !is_linux_musl && matches!(python_major_minor, "3.9" | "3.10" | "3.11" | "3.12")
1491-
{
1491+
if !is_linux_musl && matches!(python_major_minor, "3.9" | "3.10" | "3.11" | "3.12") {
14921492
wanted.insert("ossaudiodev");
14931493
}
14941494
}

‎src/verify_distribution.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def test_hashlib(self):
113113
def test_sqlite(self):
114114
import sqlite3
115115

116-
self.assertEqual(sqlite3.sqlite_version_info, (3, 46, 1))
116+
self.assertEqual(sqlite3.sqlite_version_info, (3, 47, 1))
117117

118118
# Optional SQLite3 features are enabled.
119119
conn = sqlite3.connect(":memory:")

0 commit comments

Comments
 (0)