Merge pull request #2651 from sebix/fix-2649

pkg: replace distutils by packaging

Author: sebix

.github/workflows/debian-package.yml

@@ -1,6 +1,6 @@
 #Github Workflow to build Debian packages for intelmq-api
 #
-#SPDX-FileCopyrightText: 2020 IntelMQ Team <[email protected]>
+#SPDX-FileCopyrightText: 2020 IntelMQ Team <[email protected]>, 2025 Institute for Common Good Technology
 #SPDX-License-Identifier: AGPL-3.0-or-later
 #
 name: "Build Debian packages"
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       # Fixes https://github.com/actions/virtual-environments/issues/3080
       STORAGE_OPTS: overlay.mount_program=/usr/bin/fuse-overlayfs
@@ -32,6 +32,9 @@ jobs:
     - name: Build package
       run: bash .github/workflows/scripts/debian-package.sh ${{ matrix.codename }}
 
+    - name: Test packages installation
+      run: sudo apt install ~/artifacts/*.deb
+
     - name: Upload artifact
       if: ${{ github.event_name == 'push' }}
       uses: actions/upload-artifact@v4

debian/control

@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 4.1.16),
                python3-cerberus,
                python3-dateutil (>= 2.5),
                python3-dnspython (>= 2.0.0),
+               python3-packaging,
                python3-psutil (>= 1.2.1),
                python3-redis (>= 2.10),
                python3-requests (>= 2.2.0),
@@ -61,6 +62,7 @@ Architecture: all
 Depends: python3-dateutil (>= 2.5),
          python3-dnspython (>= 2.0.0),
          python3-openssl,
+         python3-packaging,
          python3-psutil (>= 1.2.1),
          python3-redis (>= 2.10),
          python3-requests (>= 2.2.0),

intelmq/lib/processmanager.py

@@ -2,7 +2,6 @@
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 import abc
-import distutils.version
 import getpass
 import http.client
 import inspect
@@ -17,6 +16,7 @@
 import xmlrpc.client
 from typing import Union
 from collections.abc import Iterable
+from packaging.version import Version
 
 
 from intelmq import (DEFAULT_LOGGING_LEVEL,  # noqa: F401
@@ -586,7 +586,7 @@ def make_connection(self, host):
                 self.__supervisor_xmlrpc.supervisor.getAPIVersion()
             ))
 
-            if distutils.version.StrictVersion(supervisor_version) < distutils.version.StrictVersion("3.2.0"):
+            if Version(supervisor_version) < Version("3.2.0"):
                 self.__logger.warning("Current supervisor version is supported, but reloading bots will not work. "
                                       "Please upgrade supervisor to version 3.2.0 or higher.")
 

setup.py

@@ -17,6 +17,7 @@
     'redis>=2.10',
     'requests>=2.2.0',
     'ruamel.yaml',
+    'packaging',
 ]
 
 TESTS_REQUIRES = [