Skip to content
Merged
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
7 changes: 5 additions & 2 deletions .github/workflows/debian-package.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Github Workflow to build Debian packages for intelmq-api
#
#SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>
#SPDX-FileCopyrightText: 2020 IntelMQ Team <intelmq-team@cert.at>, 2025 Institute for Common Good Technology
#SPDX-License-Identifier: AGPL-3.0-or-later
#
name: "Build Debian packages"
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
4 changes: 2 additions & 2 deletions intelmq/lib/processmanager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
#
# SPDX-License-Identifier: AGPL-3.0-or-later
import abc
import distutils.version
import getpass
import http.client
import inspect
Expand All @@ -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
Expand Down Expand Up @@ -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.")

Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
'redis>=2.10',
'requests>=2.2.0',
'ruamel.yaml',
'packaging',
]

TESTS_REQUIRES = [
Expand Down
Loading