Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dronecan_gui_tool/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
# Start method must be configured globally, and only once. Using 'spawn' ensures full compatibility with Windoze.
# We need to check first if the start mode is already configured, because this code will be re-run for every child.
#
if multiprocessing.get_start_method(True) != 'spawn':
if multiprocessing.get_start_method(allow_none=True) is None:
multiprocessing.set_start_method('spawn')

#
Expand Down
14 changes: 7 additions & 7 deletions dronecan_gui_tool/widgets/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import os
import re
import pkg_resources
#import pkg_resources
import queue
from PyQt5.QtWidgets import QTableWidget, QTableWidgetItem, QAbstractItemView, QHeaderView, QApplication, QWidget, \
QComboBox, QCompleter, QPushButton, QHBoxLayout, QVBoxLayout, QMessageBox
Expand Down Expand Up @@ -639,12 +639,12 @@ def get_app_icon():
except NameError:
pass
# noinspection PyBroadException
try:
fn = pkg_resources.resource_filename('dronecan_gui_tool', os.path.join('icons', 'dronecan_gui_tool.png'))
_APP_ICON_OBJECT = QIcon(fn)
except Exception:
logger.error('Could not load icon', exc_info=True)
_APP_ICON_OBJECT = QIcon()
#try:
# fn = pkg_resources.resource_filename('dronecan_gui_tool', os.path.join('icons', 'dronecan_gui_tool.png'))
# _APP_ICON_OBJECT = QIcon(fn)
#except Exception:
# logger.error('Could not load icon', exc_info=True)
_APP_ICON_OBJECT = QIcon()
return _APP_ICON_OBJECT


Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# you need to drop setup_requires from setup.py as well.
# https://peps.python.org/pep-0518/#rationale
[build-system]
requires = ["setuptools>=42",'setuptools_git>=1.0']
requires = ["setuptools>=42",'setuptools<81','setuptools_git>=1.0']
build-backend = "setuptools.build_meta"