From 0f5685dc82b7be77de6ae1cd4e847af57a82e1bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Br=C3=A9nainn=20Woodsend?= Date: Wed, 26 Apr 2023 22:03:08 +0100 Subject: [PATCH] Remove py hidden imports for pyshark >= 0.6. pyshark now uses termcolor instead of py._io.terminalwriter for writing colored text to terminals. --- news/575.update.rst | 1 + requirements-test-libraries.txt | 2 +- .../hooks/stdhooks/hook-pyshark.py | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 news/575.update.rst diff --git a/news/575.update.rst b/news/575.update.rst new file mode 100644 index 00000000..85a129a9 --- /dev/null +++ b/news/575.update.rst @@ -0,0 +1 @@ + Remove no longer needed ``py`` hidden imports for ``pyshark >= 0.6``. diff --git a/requirements-test-libraries.txt b/requirements-test-libraries.txt index 118ec121..406f3927 100644 --- a/requirements-test-libraries.txt +++ b/requirements-test-libraries.txt @@ -112,7 +112,7 @@ soundfile==0.12.1; sys_platform != 'linux' limits==3.4.0 great-expectations==0.16.7 tensorflow==2.12.0; python_version >= '3.8' -pyshark==0.5.3 +pyshark==0.6.0 opencv-python==4.7.0.72 hydra-core==1.3.2 spiceypy==5.1.2 diff --git a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pyshark.py b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pyshark.py index 7397ec15..43bcf68f 100644 --- a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pyshark.py +++ b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pyshark.py @@ -16,9 +16,11 @@ from PyInstaller.utils.hooks import collect_data_files, is_module_satisfies -hiddenimports = ['pyshark', 'py._path.local', 'py._vendored_packages.iniconfig', 'pyshark.config'] +hiddenimports = ['pyshark.config'] -if is_module_satisfies("pyshark >= 0.5"): - hiddenimports += ["py._io.terminalwriter", "py._builtin"] +if is_module_satisfies("pyshark < 0.6"): + hiddenimports += ['py._path.local', 'py._vendored_packages.iniconfig'] + if is_module_satisfies("pyshark >= 0.5"): + hiddenimports += ["py._io.terminalwriter", "py._builtin"] datas = collect_data_files('pyshark')