aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShyamnath Premnadh <Shyamnath.Premnadh@qt.io>2023-08-08 10:40:51 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-11-09 10:04:21 +0000
commit46fb1bf7375189fbd3ad8037c68ebbb54fda7a1e (patch)
treea7c357371a7f899567abe32f1e3b510cf8d3d2f5
parentb57435d6556f047baf1c232e5def522727fd1dcd (diff)
PySide build - remove importlib_metadata
Removed for 6.6 because we don't support Python 3.7 from PySide 6.6 Change-Id: I2aea80ef28dad7bd346ff9f2321f01b3481e8762 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit 0feca608ad23ecb6b4ecfd9b988435897d081059) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--requirements.txt1
-rw-r--r--sources/pyside-tools/deploy_lib/python_helper.py7
2 files changed, 1 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt
index 8dc109304..8a3d9912f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,6 @@ numpy
nuitka==1.4.8; platform_machine != 'aarch64'
distro; sys_platform == 'linux'
patchelf==0.15; sys_platform == 'linux'
-importlib-metadata; python_version < '3.8'
pkginfo; sys_platform == 'linux'
jinja2; sys_platform == 'linux'
buildozer==1.5.0; sys_platform == 'linux'
diff --git a/sources/pyside-tools/deploy_lib/python_helper.py b/sources/pyside-tools/deploy_lib/python_helper.py
index 22c5017d2..f403b2d47 100644
--- a/sources/pyside-tools/deploy_lib/python_helper.py
+++ b/sources/pyside-tools/deploy_lib/python_helper.py
@@ -9,12 +9,7 @@ import sys
import warnings
from typing import List
from importlib import util
-
-if sys.version_info >= (3, 8):
- from importlib.metadata import version
-else:
- from importlib_metadata import version
-
+from importlib.metadata import version
from pathlib import Path
from . import Config, Nuitka, run_command