Skip to content

Commit dde6798

Browse files
Merge pull request #1038 from NethServer/sdl-7608
Add Python 3.13 support and Debian 13 compatibility
2 parents 64211fb + 2841334 commit dde6798

File tree

4 files changed

+64
-3
lines changed

4 files changed

+64
-3
lines changed
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
#
2+
# PIP requirements file for the Agent python environment
3+
# The environment is installed under /usr/local/nethserver/agent
4+
#
5+
aiodns==4.0.0
6+
aiohttp==3.13.3
7+
ansible-core==2.20.1
8+
ansible-runner==2.4.2
9+
async-timeout==5.0.1
10+
attrs==25.4.0
11+
brotlipy==0.7.0
12+
certifi==2026.1.4
13+
cffi==2.0.0
14+
chardet==5.2.0
15+
cryptography==46.0.3
16+
dnspython==2.8.0
17+
docutils==0.22.4
18+
hiredis==3.3.0
19+
idna==3.11
20+
Jinja2==3.1.6
21+
jsonschema==4.26.0
22+
ldap3==2.9.1
23+
lockfile==0.12.2
24+
MarkupSafe==3.0.3
25+
matplotlib==3.10.8
26+
multidict==6.7.0
27+
numpy==2.4.1
28+
packaging==26.0
29+
pandas-stubs==2.3.3.260113
30+
pexpect==4.9.0
31+
psutil==7.2.1
32+
ptyprocess==0.7.0
33+
pyasn1==0.6.2
34+
pycares==5.0.1
35+
pycparser==3.0
36+
pyrsistent==0.20.0
37+
python-daemon==3.1.2
38+
PyYAML==6.0.3
39+
redis==7.1.0
40+
regex-engine==1.1.0
41+
requests==2.32.5
42+
resolvelib==1.2.1
43+
semver==3.0.4
44+
six==1.17.0
45+
typing-extensions==4.15.0
46+
urllib3==2.6.3
47+
yarl==1.22.0
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Manager]
2+
ManagerEnvironment=XDG_STATE_HOME=%h/.config

core/imageroot/var/lib/nethserver/node/install-core.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,20 @@ fi
4545

4646
echo "Setup Python virtual environment for agents:"
4747
core_dir=/usr/local/agent/pyenv
48-
python3.11 -mvenv ${core_dir} --upgrade-deps --system-site-packages
49-
${core_dir}/bin/pip3 install -r /etc/nethserver/pyreq3_11.txt
48+
49+
# detect what version of python3 is available
50+
if [[ -x /usr/bin/python3.13 ]]; then
51+
python3.13 -mvenv ${core_dir} --upgrade-deps --system-site-packages
52+
${core_dir}/bin/pip3 install -r /etc/nethserver/pyreq3_13.txt
53+
elif [[ -x /usr/bin/python3.11 ]]; then
54+
python3.11 -mvenv ${core_dir} --upgrade-deps --system-site-packages
55+
${core_dir}/bin/pip3 install -r /etc/nethserver/pyreq3_11.txt
56+
else
57+
echo "$(python3 --version || echo Python 3) not supported"
58+
exit 1
59+
fi
60+
61+
# ensure the agent python packages are in the default python path
5062
echo "/usr/local/agent/pypkg" >$(${core_dir}/bin/python3 -c "import sys; print(sys.path[-1] + '/pypkg.pth')")
5163

5264
echo "Setup registry:"

core/install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ if [[ "${PLATFORM_ID}" == "platform:el9" ]]; then
8080
dnf update -y # Fix SELinux issues with basic packages
8181
dnf install -y wireguard-tools podman curl jq openssl firewalld pciutils python3.11 fio
8282
systemctl enable --now firewalld
83-
elif [[ "${ID}" == "debian" && "${VERSION_ID}" == "12" ]]; then
83+
elif [[ "${ID}" == "debian" && ( "${VERSION_ID}" == "12" || "${VERSION_ID}" == "13" ) ]]; then
8484
apt-get update
8585
apt-get -y install gnupg2
8686
apt-get update

0 commit comments

Comments
 (0)