diff options
| author |   Volker Schroer <3470424+dl1ksv@users.noreply.github.com> | 2021-12-20 20:33:01 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-12-20 14:33:01 -0500 |
| commit | 635adb7c4d195a0bca899bc10a8eeeacca6857e9 (patch) | |
| tree | 15c08d162bc003b20f8e7990d7fe3e9ba8f869b1 /grc | |
| parent | qtgui: add bounds checks to calculation of d_fft_size_combo index (diff) | |
| download | gnuradio-635adb7c4d195a0bca899bc10a8eeeacca6857e9.tar.xz gnuradio-635adb7c4d195a0bca899bc10a8eeeacca6857e9.zip | |
cmake: replace deprecated distutils
* gnuradio: replace deprecated distutils
Check if python packaging is available
Signed-off-by: Volker Schroer <3470424+dl1ksv@users.noreply.github.com>
* Add packaging requirement
Signed-off-by: Volker Schroer <3470424+dl1ksv@users.noreply.github.com>
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/core/generator/flow_graph.py.mako | 2 | ||||
| -rw-r--r-- | grc/gui/Dialogs.py | 2 | ||||
| -rw-r--r-- | grc/gui/Executor.py | 2 | ||||
| -rw-r--r-- | grc/gui/canvas/flowgraph.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/grc/core/generator/flow_graph.py.mako b/grc/core/generator/flow_graph.py.mako index c2602a36f..b1c369177 100644 --- a/grc/core/generator/flow_graph.py.mako +++ b/grc/core/generator/flow_graph.py.mako @@ -22,7 +22,7 @@ ################################################## % if generate_options == 'qt_gui': -from distutils.version import StrictVersion +from packaging.version import Version as StrictVersion if __name__ == '__main__': import ctypes diff --git a/grc/gui/Dialogs.py b/grc/gui/Dialogs.py index 7bdfb2aec..1b837004a 100644 --- a/grc/gui/Dialogs.py +++ b/grc/gui/Dialogs.py @@ -7,7 +7,7 @@ import sys import textwrap -from distutils.spawn import find_executable +from shutil import which as find_executable from gi.repository import Gtk, GLib, Gdk diff --git a/grc/gui/Executor.py b/grc/gui/Executor.py index 78f91d93e..9db9a6255 100644 --- a/grc/gui/Executor.py +++ b/grc/gui/Executor.py @@ -11,7 +11,7 @@ import subprocess import threading import time from pathlib import Path -from distutils.spawn import find_executable +from shutil import which as find_executable from gi.repository import GLib diff --git a/grc/gui/canvas/flowgraph.py b/grc/gui/canvas/flowgraph.py index 7c086f364..b217a2e0c 100644 --- a/grc/gui/canvas/flowgraph.py +++ b/grc/gui/canvas/flowgraph.py @@ -10,7 +10,7 @@ SPDX-License-Identifier: GPL-2.0-or-later import ast import functools import random -from distutils.spawn import find_executable +from shutil import which as find_executable from itertools import count from gi.repository import GLib, Gtk |