Skip to content

Commit 30e121d

Browse files
ahornbymeta-codesync[bot]
authored andcommitted
update centos 9 python rpm to 3.12
Summary: CentOS Stream 9 default is python 3.9, update the manifest to use the available [redhat 3.12 packages](https://docs.redhat.com/en/documentation/red_hat_enterprise_linux/9/html/installing_and_using_dynamic_programming_languages/assembly_installing-and-using-python_installing-and-using-dynamic-programming-languages) Sapling needs python 3.10+ as it has modern type declarations and match keyword usage. I would have taken the RPMS to 3.10 to match ubuntu 22.04 but redhat don't make that available so take it to 3.12 to match upcoming CentOS Stream 10. Test fixes: * run-tests.py had a modification while in use error on runningtests.items() * test-fbconduit.t: updated `eden/scm/sapling/httpclient/__init__.py` as it was using a removed deprecated API. The [new one](https://docs.python.org/3.10/library/ssl.html?highlight=sslcontext%20wrap_socket#ssl.SSLContext.wrap_socket) has been present since python 3.7. * test-debugfilterid.t: failing as code under test was returning nothing in a non-fb build. It builds ok in non-fb, so removed the conditional compilation * test-git-shallow.t: was assuming uploadpack.allowFilter was set which is not true on github CI. set it explicitly Reviewed By: zzl0 Differential Revision: D88010541 fbshipit-source-id: 08a451f16e4725b11e06f78d3db925d0285286a1
1 parent 5946d1c commit 30e121d

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

build/fbcode_builder/manifests/python

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ python@3.8
88
python3
99
python3-devel
1010

11+
# Centos Stream 9 default python is 3.9, sapling needs 3.10+
12+
[rpms.all(distro=centos_stream,distro_vers=9)]
13+
python3.12
14+
python3.12-devel
15+
1116
# sapling needs dataclasses which arrive in 3.7, and the bionic python is 3.6
1217
[debs.all(distro=ubuntu,distro_vers="18.04")]
1318
python3.8-dev

build/fbcode_builder/manifests/python-setuptools

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ builder = python-wheel
1111
[rpms]
1212
python3-setuptools
1313

14+
# Centos Stream 9 default python is 3.9, sapling needs 3.10+
15+
[rpms.all(distro=centos_stream,distro_vers=9)]
16+
python3.12-setuptools
17+
1418
[homebrew]
1519
python-setuptools
1620

0 commit comments

Comments
 (0)