Skip to content

Commit

Permalink
Update to latest Python patch versions (#400)
Browse files Browse the repository at this point in the history
* Update to latest Python patch versions

* Add `atomic` to allowed system libraries

* Allow `libatomic.so.1`
  • Loading branch information
zanieb authored Dec 5, 2024
1 parent 3dbca1c commit a53a38b
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 23 deletions.
11 changes: 10 additions & 1 deletion cpython-unix/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,16 @@
EXTENSION_MODULES = SUPPORT / "extension-modules.yml"
TARGETS_CONFIG = SUPPORT / "targets.yml"

LINUX_ALLOW_SYSTEM_LIBRARIES = {"c", "crypt", "dl", "m", "pthread", "rt", "util"}
LINUX_ALLOW_SYSTEM_LIBRARIES = {
"c",
"crypt",
"dl",
"m",
"pthread",
"rt",
"util",
"atomic",
}
MACOS_ALLOW_SYSTEM_LIBRARIES = {"dl", "m", "pthread"}
MACOS_ALLOW_FRAMEWORKS = {"CoreFoundation"}

Expand Down
40 changes: 20 additions & 20 deletions pythonbuild/downloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,46 +35,46 @@
"license_file": "LICENSE.bzip2.txt",
},
"cpython-3.9": {
"url": "https://www.python.org/ftp/python/3.9.20/Python-3.9.20.tar.xz",
"size": 19648968,
"sha256": "6b281279efd85294d2d6993e173983a57464c0133956fbbb5536ec9646beaf0c",
"version": "3.9.20",
"url": "https://www.python.org/ftp/python/3.9.21/Python-3.9.21.tar.xz",
"size": 19647056,
"sha256": "3126f59592c9b0d798584755f2bf7b081fa1ca35ce7a6fea980108d752a05bb1",
"version": "3.9.21",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp39",
},
"cpython-3.10": {
"url": "https://www.python.org/ftp/python/3.10.15/Python-3.10.15.tar.xz",
"size": 19596540,
"sha256": "aab0950817735172601879872d937c1e4928a57c409ae02369ec3d91dccebe79",
"version": "3.10.15",
"url": "https://www.python.org/ftp/python/3.10.16/Python-3.10.16.tar.xz",
"size": 19610392,
"sha256": "bfb249609990220491a1b92850a07135ed0831e41738cf681d63cf01b2a8fbd1",
"version": "3.10.16",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp310",
},
"cpython-3.11": {
"url": "https://www.python.org/ftp/python/3.11.10/Python-3.11.10.tar.xz",
"size": 20067656,
"sha256": "07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372",
"version": "3.11.10",
"url": "https://www.python.org/ftp/python/3.11.11/Python-3.11.11.tar.xz",
"size": 20085792,
"sha256": "2a9920c7a0cd236de33644ed980a13cbbc21058bfdc528febb6081575ed73be3",
"version": "3.11.11",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp311",
},
"cpython-3.12": {
"url": "https://www.python.org/ftp/python/3.12.7/Python-3.12.7.tar.xz",
"size": 20444032,
"sha256": "24887b92e2afd4a2ac602419ad4b596372f67ac9b077190f459aba390faf5550",
"version": "3.12.7",
"url": "https://www.python.org/ftp/python/3.12.8/Python-3.12.8.tar.xz",
"size": 20489808,
"sha256": "c909157bb25ec114e5869124cc2a9c4a4d4c1e957ca4ff553f1edc692101154e",
"version": "3.12.8",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp312",
},
"cpython-3.13": {
"url": "https://www.python.org/ftp/python/3.13.0/Python-3.13.0.tar.xz",
"size": 22532980,
"sha256": "086de5882e3cb310d4dca48457522e2e48018ecd43da9cdf827f6a0759efb07d",
"version": "3.13.0",
"url": "https://www.python.org/ftp/python/3.13.1/Python-3.13.1.tar.xz",
"size": 22589692,
"sha256": "9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9",
"version": "3.13.1",
"licenses": ["Python-2.0", "CNRI-Python"],
"license_file": "LICENSE.cpython.txt",
"python_tag": "cp313",
Expand Down
4 changes: 2 additions & 2 deletions src/validation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const ELF_ALLOWED_LIBRARIES: &[&str] = &[
"libpthread.so.0",
"librt.so.1",
"libutil.so.1",
"libatomic.so.1",
];

const PE_ALLOWED_LIBRARIES: &[&str] = &[
Expand Down Expand Up @@ -1487,8 +1488,7 @@ fn validate_extension_modules(
wanted.extend(GLOBAL_EXTENSIONS_LINUX_PRE_3_13);
}

if !is_linux_musl && matches!(python_major_minor, "3.9" | "3.10" | "3.11" | "3.12")
{
if !is_linux_musl && matches!(python_major_minor, "3.9" | "3.10" | "3.11" | "3.12") {
wanted.insert("ossaudiodev");
}
}
Expand Down

0 comments on commit a53a38b

Please sign in to comment.