aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShyamnath Premnadh <Shyamnath.Premnadh@qt.io>2022-10-25 14:13:59 +0200
committerSimo Fält <simo.falt@qt.io>2022-10-25 18:18:12 +0000
commit98799cfac0d9e4e74d10200eaf95a8df81a40d66 (patch)
tree1950f426178b3eb8c0de836e25651346fc693659
parent589b5ca8c5b1d0df6cfb0a5d084a1b729d164eb7 (diff)
Deploy Tool Fix: os.fspath instead of pathlibv6.4.0.16.4.0
- for subprocess calls use os.fspath instead of pathlib Change-Id: I7f0a47d4c8a0d9daa55d6b432f9bac9ed2019a91 Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 3a3eb76b59615dd8db2a9220f26c46cf3d839b59) Reviewed-by: Simo Fält <simo.falt@qt.io>
-rw-r--r--sources/pyside-tools/deploy/nuitka_helper.py3
-rw-r--r--sources/pyside-tools/deploy/python_helper.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/sources/pyside-tools/deploy/nuitka_helper.py b/sources/pyside-tools/deploy/nuitka_helper.py
index 031495de7..fc0916276 100644
--- a/sources/pyside-tools/deploy/nuitka_helper.py
+++ b/sources/pyside-tools/deploy/nuitka_helper.py
@@ -1,6 +1,7 @@
# Copyright (C) 2022 The Qt Company Ltd.
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+import os
import sys
from pathlib import Path
from . import run_command
@@ -33,7 +34,7 @@ class Nuitka:
output_dir.mkdir(parents=True, exist_ok=True)
print("[DEPLOY] Running Nuitka")
command = self.nuitka + [
- source_file,
+ os.fspath(source_file),
"--follow-imports",
"--onefile",
"--enable-plugin=pyside6",
diff --git a/sources/pyside-tools/deploy/python_helper.py b/sources/pyside-tools/deploy/python_helper.py
index 3831b7dde..ea5859cea 100644
--- a/sources/pyside-tools/deploy/python_helper.py
+++ b/sources/pyside-tools/deploy/python_helper.py
@@ -20,7 +20,7 @@ class PythonExecutable:
self.dry_run = dry_run
if create_venv:
self.__create_venv()
- self.nuitka = Nuitka(nuitka=[self.exe, "-m", "nuitka"])
+ self.nuitka = Nuitka(nuitka=[os.fspath(self.exe), "-m", "nuitka"])
@property
def exe(self):