fix: use versioned Python sitepackages paths instead of symlinks

alibuild.sh

@@ -18,7 +18,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import alibuild_helpers; print(alibuild_helpers.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$ALIBUILD_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$ALIBUILD_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
   PATH: "$ALIBUILD_ROOT/bin"
 ---
 #!/bin/bash -e
@@ -28,8 +28,6 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "alibuild==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 # Move scripts installed into the target to the bin directory
 mkdir -p "$INSTALLROOT/bin"
 mv "$TARGET/bin"/* "$INSTALLROOT/bin/"
@@ -38,6 +36,6 @@ mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 prepend-path PATH \$PKG_ROOT/bin
 EOF

bitsorg.sh

@@ -16,7 +16,7 @@ build_requires:
 prefer_system_check: |
   python3 -c 'import alibuild_helpers' || exit 1
 prepend_path:
-  PYTHONPATH: "$BITSORG_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$BITSORG_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
   PATH: "$BITSORG_ROOT/bin"
 ---
 #!/bin/bash -e
@@ -26,8 +26,6 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "bitsorg==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 # Move scripts installed into the target to the bin directory
 mkdir -p "$INSTALLROOT/bin"
 mv "$TARGET/../../../bin"/* "$INSTALLROOT/bin/"
@@ -36,6 +34,6 @@ mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 prepend-path PATH \$PKG_ROOT/bin
 EOF

python-awkward-cpp.sh

@@ -14,7 +14,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import awkward_cpp; print(awkward_cpp.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_AWKWARD_CPP_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_AWKWARD_CPP_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -23,11 +23,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "awkward-cpp==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-awkward.sh

@@ -17,7 +17,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import awkward; print(awkward.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_AWKWARD_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_AWKWARD_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -26,11 +26,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "awkward==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-certifi.sh

@@ -13,7 +13,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import certifi; print(certifi.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_CERTIFI_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_CERTIFI_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -22,11 +22,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "certifi==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-charset-normalizer.sh

@@ -13,7 +13,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import charset_normalizer; print(charset_normalizer.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_CHARSET_NORMALIZER_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_CHARSET_NORMALIZER_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -22,11 +22,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "charset_normalizer==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-contourpy.sh

@@ -14,7 +14,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import contourpy; print(contourpy.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_CONTOURPY_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_CONTOURPY_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -23,11 +23,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "contourpy==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-cramjam.sh

@@ -13,7 +13,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import cramjam; print(cramjam.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_CRAMJAM_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_CRAMJAM_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -22,11 +22,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "cramjam==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-cycler.sh

@@ -13,7 +13,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import cycler; print(cycler.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_CYCLER_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_CYCLER_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -22,11 +22,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "cycler==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-dateutil.sh

@@ -14,7 +14,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import dateutil; print(dateutil.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_DATEUTIL_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_DATEUTIL_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -23,11 +23,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "python-dateutil==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-distro.sh

@@ -13,7 +13,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import distro; print(distro.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_DISTRO_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_DISTRO_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -22,11 +22,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "distro==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-execnet.sh

@@ -11,7 +11,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import execnet; print(execnet.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_EXECNET_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_EXECNET_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -20,11 +20,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "execnet==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-fonttools.sh

@@ -13,7 +13,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import fontTools; print(fontTools.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_FONTTOOLS_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_FONTTOOLS_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -22,11 +22,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "fonttools==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-fsspec.sh

@@ -13,7 +13,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import fsspec; print(fsspec.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_FSSPEC_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_FSSPEC_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -22,11 +22,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "fsspec==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-idna.sh

@@ -13,7 +13,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import idna; print(idna.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_IDNA_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_IDNA_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -22,11 +22,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "idna==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-iniconfig.sh

@@ -11,7 +11,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import iniconfig; print(iniconfig.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_INICONFIG_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_INICONFIG_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -20,11 +20,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "iniconfig==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF

python-jinja2.sh

@@ -14,7 +14,7 @@ prefer_system_check: |
   SYSTEM_VERSION=$(python3 -c 'import jinja2; print(jinja2.__version__)')
   printf '%s\n%s\n' "$PKGVERSION" "$SYSTEM_VERSION" | sort -V -C
 prepend_path:
-  PYTHONPATH: "$PYTHON_JINJA2_ROOT/lib/python/site-packages"
+  PYTHONPATH: "$PYTHON_JINJA2_ROOT/lib/python$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')/site-packages"
 ---
 #!/bin/bash -e
 pyver=$(python3 -c 'import sysconfig; print(sysconfig.get_python_version())')
@@ -23,11 +23,9 @@ mkdir -p "$TARGET"
 
 uv pip install --no-deps --no-cache-dir --target="$TARGET" --python="$(command -v python3)" "Jinja2==$PKGVERSION"
 
-ln -snf "python$pyver" "$INSTALLROOT/lib/python"
-
 mkdir -p "$INSTALLROOT/etc/modulefiles"
 alibuild-generate-module > "$INSTALLROOT/etc/modulefiles/$PKGNAME"
 cat >> "$INSTALLROOT/etc/modulefiles/$PKGNAME" <<EOF
 set PKG_ROOT \$::env(BASEDIR)/$PKGNAME/\$version
-prepend-path PYTHONPATH \$PKG_ROOT/lib/python/site-packages
+prepend-path PYTHONPATH \$PKG_ROOT/lib/python$pyver/site-packages
 EOF