Remove pkg resources (#1091)

* replace parse_version * macos-13 action runner * importlib.resources * fix windows build * fix changelog --------- Co-authored-by: Henri Wahl <[email protected]>
HenriWahl · Jan 26, 2025 · b1568b0 · b1568b0
1 parent 29a421e
commit b1568b0
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 13 deletions.
diff --git a/.github/workflows/build-release-latest.yml b/.github/workflows/build-release-latest.yml
@@ -209,7 +209,7 @@ jobs:
           name: ${{ github.job }}
 
   macos-intel:
-    runs-on: macos-12
+    runs-on: macos-13
     needs: test
     steps:
       - uses: actions/checkout@v4

diff --git a/Nagstamon/Config.py b/Nagstamon/Config.py
@@ -19,6 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 from argparse import ArgumentParser
+from importlib import resources
 import os
 import platform
 import sys
@@ -131,7 +132,7 @@ class AppInfo(object):
         contains app information previously located in GUI.py
     """
     NAME = 'Nagstamon'
-    VERSION = '3.17-20241102'
+    VERSION = '3.17-20241219'
     WEBSITE = 'https://nagstamon.de'
     COPYRIGHT = '©2008-2024 Henri Wahl et al.'
     COMMENTS = 'Nagios status monitor for your desktop'
@@ -1063,12 +1064,10 @@ def __init__(self, **kwds):
     if os.path.exists(os.path.normcase(os.sep.join((executable_dir, "resources")))):
         RESOURCES = os.path.normcase(os.sep.join((executable_dir, "resources")))
     else:
-        import pkg_resources
-
-        RESOURCES = pkg_resources.resource_filename("Nagstamon", "resources")
+        RESOURCES = str(resources.files("Nagstamon").joinpath("resources"))
 
 except Exception as err:
-    # get resources directory from current directory - only if not being set before by pkg_resources
+    # get resources directory from current directory - only if not being set before
     # try-excepts necessary for platforms like Windows .EXE
     paths_to_check = [os.path.normcase(os.path.join(os.getcwd(), "Nagstamon", "resources")),
                       os.path.normcase(os.path.join(os.getcwd(), "resources"))]

diff --git a/Nagstamon/Servers/ZabbixProblemBased.py b/Nagstamon/Servers/ZabbixProblemBased.py
@@ -4,7 +4,7 @@
 import time
 import logging
 import requests
-from pkg_resources import parse_version
+from packaging import version
 
 from Nagstamon.Helpers import HumanReadableDurationFromTimestamp
 from Nagstamon.Config import conf
@@ -200,7 +200,7 @@ def _get_status(self):
                         self.new_hosts[host_id].scheduled_downtime = True
 
                     #old api shows host interfaces status in host object
-                    if parse_version(self.zbx_version) < parse_version("5.4.0"):
+                    if version.parse(self.zbx_version) < version.parse("5.4.0"):
 
                         #host not available via agent
                         if trigger[0]['hosts'][0].get('available', '0') == "2":

diff --git a/build/debian/changelog b/build/debian/changelog
@@ -1,9 +1,14 @@
-nagstamon (3.17-20241102) unstable; urgency=low
+nagstamon (3.17-20241219) unstable; urgency=low
+  * New upstream
+
+ -- Henri Wahl <[email protected]> Thu, Dec 19 2024 08:00:00 +0200
+
+nagstamon (3.16.2) stable; urgency=low
   * New upstream
     - fix sound problem
     - fix IncingaDBWeb
 
- -- Henri Wahl <[email protected]> Sat, Nov 02 2024 08:00:00 +0200
+ -- Henri Wahl <[email protected]> Mon, Oct 21 2024 08:00:00 +0200
 
 nagstamon (3.16.1) stable; urgency=low
   * New upstream

diff --git a/build/debian/control b/build/debian/control
@@ -13,9 +13,9 @@ Vcs-Browser: https://codeload.github.com/HenriWahl/Nagstamon/zip/master
 Package: nagstamon
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}, python3-pkg-resources, python3-bs4, python3-lxml,
- python3-pyqt5, python3-pyqt5.qtsvg, python3-pyqt5.qtmultimedia, libqt5multimedia5-plugins,
- python3-requests, python3-requests-kerberos, python3-psutil, python3-dbus.mainloop.pyqt5,
- python3-keyring, python3-ewmh, python3-arrow
+ python3-packaging, python3-pyqt5, python3-pyqt5.qtsvg, python3-pyqt5.qtmultimedia,
+ libqt5multimedia5-plugins, python3-requests, python3-requests-kerberos, python3-psutil,
+ python3-dbus.mainloop.pyqt5, python3-keyring, python3-ewmh, python3-arrow
 Recommends: python3-secretstorage
 Description: Nagios status monitor which takes place in systray or on desktop
  Nagstamon is a Nagios status monitor which takes place in systray or 

diff --git a/build/redhat/nagstamon.spec b/build/redhat/nagstamon.spec
@@ -23,6 +23,7 @@ Requires:      python3-dateutil
 Requires:      python3-dbus
 Requires:      python3-keyring
 Requires:      python3-lxml
+Requires:      python3-packaging
 Requires:      python3-psutil
 Requires:      python3-pysocks
 Requires:      python3-pyqt6

diff --git a/build/requirements/linux.txt b/build/requirements/linux.txt
@@ -3,6 +3,7 @@ beautifulsoup4
 dbus-python
 keyring
 lxml
+packaging
 psutil
 pyqt6
 pyqt6-qt6

diff --git a/build/requirements/macos.txt b/build/requirements/macos.txt
@@ -2,6 +2,7 @@ arrow
 beautifulsoup4
 keyring
 lxml
+packaging
 psutil
 pyinstaller
 pyobjc-framework-ApplicationServices

diff --git a/build/requirements/windows.txt b/build/requirements/windows.txt
@@ -3,6 +3,7 @@ beautifulsoup4
 keyring
 lxml
 pip-system-certs
+packaging
 psutil
 pyinstaller
 pypiwin32

diff --git a/setup.py b/setup.py
@@ -99,6 +99,7 @@
                                           'python3-dateutil '
                                           'python3-keyring '
                                           'python3-lxml '
+                                          'python3-packaging '
                                           'python3-psutil '
                                           'python3-pysocks '
                                           'python3-qt5 '
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ beautifulsoup4 @@
     dbus-python
     keyring
     lxml
+    packaging
     psutil
     pyqt6
     pyqt6-qt6
@@ Expand Down @@