@@ -44,10 +44,13 @@ _installPipCommon() {
4444 fi
4545}
4646
47+ _installPipSystem () {
48+ apt-get -y install python3-pandas python3-numpy python3-click python3-yaml python3-yamlfix
49+ }
50+
4751# Enterprise Linux 7 cleanup
4852_install_EL7_CleanUp () {
4953 yum clean -y all
50- rm -rf /var/lib/apt/lists/*
5154}
5255
5356# Enterprise Linux 7 package installation (EL7 = RHEL 7 or CentOS 7)
@@ -76,7 +79,6 @@ _install_EL7_Packages() {
7679# Enterprise Linux 8/9 cleanup
7780_install_EL8_EL9_CleanUp () {
7881 dnf clean -y all
79- rm -rf /var/lib/apt/lists/*
8082}
8183
8284# Enterprise Linux 8/9 package installation (EL8/EL9 = RHEL, Rocky Linux, AlmaLinux, or CentOS 8 as no CentOS 9 exists)
@@ -426,18 +428,18 @@ case "${os}" in
426428 if [[ ${CI} == " yes" ]]; then
427429 echo " WARNING: Installing CI dependencies is only supported on Ubuntu 22.04" >&2
428430 fi
429-
431+
430432 # Detect EL version to choose appropriate functions
431433 if [[ -f /etc/os-release ]]; then
432434 elVersion=$( awk -F= ' /^VERSION_ID/{print $2}' /etc/os-release | sed ' s/"//g' | cut -d. -f1)
433435 else
434436 echo " ERROR: Could not detect Enterprise Linux version" >&2
435437 exit 1
436438 fi
437-
439+
438440 # First install OpenROAD base
439441 _installORDependencies
440-
442+
441443 # Determine between EL7 vs EL8/9, since yum vs dnf should be used, and different Klayout builds exist
442444 case " ${elVersion} " in
443445 " 7" )
@@ -459,7 +461,7 @@ case "${os}" in
459461 exit 1
460462 ;;
461463 esac
462-
464+
463465 if [[ " ${option} " == " common" || " ${option} " == " all" ]]; then
464466 _installPipCommon
465467 fi
@@ -478,14 +480,18 @@ case "${os}" in
478480 _installUbuntuPackages " ${version} "
479481 _installUbuntuCleanUp
480482 fi
481- if [[ " ${option} " == " common " || " ${option} " == " all " ]]; then
482- if [[ $version != " rodete " ]]; then
483+ if [[ $version != " rodete " ]]; then
484+ if [[ " ${option} " == " common " || " ${option} " == " all " ]]; then
483485 if _versionCompare ${version} -lt 23.04 ; then
484486 _installPipCommon
487+ else
488+ if [[ " ${option} " == " base" || " ${option} " == " all" ]]; then
489+ _installPipSystem
490+ fi
485491 fi
486- else
487- echo " Skip common for rodete"
488492 fi
493+ else
494+ echo " Skip pip packages for rodete"
489495 fi
490496 ;;
491497 " Darwin" )
0 commit comments