Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3ad98f5 authored by Jack He's avatar Jack He Committed by Automerger Merge Worker
Browse files

[GD Cert] Support Python 3.9 am: 72bccfac am: 87101f4a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1560288

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86b2d333c274175ec73c8d400045c76e7cc785da
parents 42cd321f 87101f4a
Loading
Loading
Loading
Loading
+9 −3
Original line number Original line Diff line number Diff line
@@ -54,8 +54,14 @@ function check_environment {
      echo
      echo
      exit 1
      exit 1
    fi
    fi
    if ! [ -x "$(command -v python3.8)" ] ; then
    if ! [ -x "$(command -v python3.9)" ] ; then
      echo -e "${RED}You must have python 3.8 installed${NOCOLOR}"
      echo -e "${RED}You must have python 3.9 installed${NOCOLOR}"
      exit 1
    fi
    python3.9 -m virtualenv --version
    if [[ $? -ne 0 ]] ; then
        echo "${RED}virtualenv not installed for python3.9${NOCOLOR}"
        echo "${RED}Please run 'python3.9 -m pip install virtualenv' to install it${NOCOLOR}"
        exit 1
        exit 1
    fi
    fi
}
}
@@ -265,7 +271,7 @@ function setup_venv {
            echo -e "${NOCOLOR}"
            echo -e "${NOCOLOR}"
        fi
        fi
    fi
    fi
    python3.8 -m virtualenv --python `which python3.8` "${CERT_TEST_VENV}"
    python3.9 -m virtualenv --python `which python3.9` "${CERT_TEST_VENV}"
    if [[ $? -ne 0 ]] ; then
    if [[ $? -ne 0 ]] ; then
        echo "Error setting up virtualenv"
        echo "Error setting up virtualenv"
        exit 1
        exit 1
+2 −2
Original line number Original line Diff line number Diff line
@@ -74,9 +74,9 @@ class InstallLocalPackagesForInstallation(install):
        if self.reuse_acts and is_acts_importable():
        if self.reuse_acts and is_acts_importable():
            self.announce('Reusing existing ACTS installation', log.WARN)
            self.announce('Reusing existing ACTS installation', log.WARN)
        else:
        else:
            self.announce('Installing ACTS for installation', log.WARN)
            self.announce('Installing ACTS library', log.WARN)
            setup_acts_for_cmd_or_die("install")
            setup_acts_for_cmd_or_die("install")
            self.announce('ACTS installed for installation.', log.WARN)
            self.announce('ACTS installed.', log.WARN)
        if not is_acts_importable():
        if not is_acts_importable():
            raise DistutilsModuleError("Cannot import acts after installation")
            raise DistutilsModuleError("Cannot import acts after installation")
        install.run(self)
        install.run(self)