Skip to content
Open
4 changes: 2 additions & 2 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 importlib.resources
import queue
from PyQt5.QtWidgets import QTableWidget, QTableWidgetItem, QAbstractItemView, QHeaderView, QApplication, QWidget, \
QComboBox, QCompleter, QPushButton, QHBoxLayout, QVBoxLayout, QMessageBox
Expand Down Expand Up @@ -640,7 +640,7 @@ def get_app_icon():
pass
# noinspection PyBroadException
try:
fn = pkg_resources.resource_filename('dronecan_gui_tool', os.path.join('icons', 'dronecan_gui_tool.png'))
fn = str(importlib.resources.files('dronecan_gui_tool').joinpath('icons', 'dronecan_gui_tool.png'))
_APP_ICON_OBJECT = QIcon(fn)
except Exception:
logger.error('Could not load icon', exc_info=True)
Expand Down
8 changes: 4 additions & 4 deletions pip_sizes.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

import os
import pkg_resources
import importlib.metadata

def calc_container(path):
total_size = 0
Expand All @@ -13,15 +13,15 @@ def calc_container(path):



dists = [d for d in pkg_resources.working_set]
dists = list(importlib.metadata.distributions())

data = {}
data2 = []
data3 = {}

for dist in dists:
try:
path = os.path.join(dist.location, dist.project_name)
path = os.path.join(str(dist._path.parent), dist.metadata['Name'])
size = calc_container(path)
if size/1000 > 1.0:
#print (f"{dist}: {size/1000} KB")
Expand All @@ -30,7 +30,7 @@ def calc_container(path):
data2.append(a.split()[0])# first word
data3[a.split()[0]] = f"{dist}: {size/1000} KB"
except OSError:
'{} no longer exists'.format(dist.project_name)
'{} no longer exists'.format(dist.metadata['Name'])

sorted_dict = dict(sorted(data.items()))
sorted_dict2 = sorted(data2)
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@
import os
import sys
import shutil
import pkg_resources
import glob
from setuptools import setup, find_packages
from setuptools.archive_util import unpack_archive

PACKAGE_NAME = 'dronecan_gui_tool'
HUMAN_FRIENDLY_NAME = 'DroneCAN GUI Tool'
Expand Down Expand Up @@ -115,6 +113,8 @@

if ('bdist_msi' in sys.argv) or ('build_exe' in sys.argv):
import cx_Freeze
import pkg_resources
from setuptools.archive_util import unpack_archive

# cx_Freeze can't handle 3rd-party packages packed in .egg files, so we have to extract them for it
dependency_eggs_to_unpack = [
Expand Down