GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-24 01:40:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: use python instead of python3 if python3 is not available on windows

Browse Source
This commit is contained in:
xucong053
2022-06-15 11:27:35 +08:00
parent 4fdb24a8a8
commit 94366b0ecc
15 changed files with 55 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/build.go
View File

@@ -194,7 +194,7 @@ func buildGo(path string, output string) error {
func buildPy(path string, output string) error {
log.Info().Str("path", path).Str("output", output).Msg("start to prepare python plugin")
// check the syntax of debugtalk.py
err := builtin.ExecCommand("python3", "-m", "py_compile", path)
err := builtin.ExecPython3Command("py_compile", path)
if err != nil {
return errors.Wrap(err, "python plugin syntax invalid")
}

14
hrp/internal/builtin/utils_unix.go
View File

@@ -8,11 +8,23 @@ import (
"os"
"os/exec"
"path/filepath"
"strings"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)
func isPython3(python string) bool {
out, err := exec.Command(python, "--version").Output()
if err != nil {
return false
}
if strings.HasPrefix(string(out), "Python 3") {
return true
}
return false
}
func getPython3Executable(venvDir string) string {
return filepath.Join(venvDir, "bin", "python3")
}
@@ -26,7 +38,7 @@ func ensurePython3Venv(venv string, packages ...string) (python3 string, err err
Msg("ensure python3 venv")
// check if python3 venv is available
if err := exec.Command(python3, "--version").Run(); err != nil {
if isPython3(python3) {
// python3 venv not available, create one
// check if system python3 is available
if err := ExecCommand("python3", "--version"); err != nil {

31
hrp/internal/builtin/utils_windows.go
View File

@@ -14,8 +14,30 @@ import (
"github.com/rs/zerolog/log"
)
func init() {
// use python instead of python3 if python3 is not available
if !isPython3(python3Executable) {
python3Executable = "python"
}
}
func isPython3(python string) bool {
out, err := exec.Command("cmd", "/c", python, "--version").Output()
if err != nil {
return false
}
if strings.HasPrefix(string(out), "Python 3") {
return true
}
return false
}
func getPython3Executable(venvDir string) string {
return filepath.Join(venvDir, "Scripts", "python3.exe")
python := filepath.Join(venvDir, "Scripts", "python3.exe")
if isPython3(python) {
return python
}
return filepath.Join(venvDir, "Scripts", "python.exe")
}
func ensurePython3Venv(venvDir string, packages ...string) (python3 string, err error) {
@@ -28,11 +50,12 @@ func ensurePython3Venv(venvDir string, packages ...string) (python3 string, err
systemPython := "python3"
// check if python3 venv is available
if err := exec.Command("cmd", "/c", python3, "--version").Run(); err != nil {
if !isPython3(python3) {
// python3 venv not available, create one
// check if system python3 is available
if err := ExecCommand(systemPython, "--version"); err != nil {
if err := ExecCommand("python", "--version"); err != nil {
log.Warn().Str("pythonPath", python3).Msg("python3 venv is not available, try to check system python3")
if !isPython3(systemPython) {
if !isPython3("python") {
return "", errors.Wrap(err, "python3 not found")
}
systemPython = "python"