chore: updated package to 3.13

Containerfile

@@ -1,28 +1,24 @@
-FROM python:3.11.7
+FROM python:3.13.9
 RUN apt-get update \
     && apt-get install -y \
-      cmake \
-      liblua5.1-0-dev \
-      lua5.1 \
-      libjson-c-dev
+    cmake \
+    liblua5.1-0-dev \
+    lua5.1 \
+    libjson-c-dev
 
-RUN mkdir /tmp/requirements \
-    && git clone https://github.com/openwrt/libubox.git /tmp/requirements/libubox \
-    && cd /tmp/requirements/libubox \
-    && git checkout 49056d178f42da98048a5d4c23f83a6f6bc6dd80 \
+ADD https://github.com/openwrt/libubox.git#815633847cd32ffe6da28943cbeb37edc88265c8 /tmp/requirements/libubox
+RUN cd /tmp/requirements/libubox \
     && cmake CMakeLists.txt \
-    && make install \
-    && git clone https://github.com/openwrt/ubus.git /tmp/requirements/ubus \
-    && cd /tmp/requirements/ubus \
-    && git checkout 60e04048a0e2f3e33651c19e62861b41be4c290f \
+    && make install
+ADD https://github.com/openwrt/ubus.git#3cc98db1a422dcf560f2d6347fd410f17565a89d /tmp/requirements/ubus
+RUN cd /tmp/requirements/ubus \
     && cmake CMakeLists.txt \
-    && make install \
-    && git clone https://github.com/openwrt/uci.git /tmp/requirements/uci \
-    && cd /tmp/requirements/uci \
-    && git checkout 16ff0badbde7e17ec3bd1f827ffe45922956cf86 \
+    && make install
+ADD https://github.com/openwrt/uci.git#66127cd76c5d0bd46d5a90302cc6110f53a4e2f8 /tmp/requirements/uci
+RUN cd /tmp/requirements/uci \
     && cmake CMakeLists.txt \
-    && make install \
-    && rm -rf /tmp/requirements \
+    && make install
+RUN rm -rf /tmp/requirements \
     && echo "/usr/local/lib" >> /etc/ld.so.conf.d/local.conf \
     && ldconfig
 

requirements.txt

@@ -3,4 +3,4 @@ pydoctor==24.11.2
 pytest==8.3.5
 pytest-mock==3.14.0
 pyuci==0.10.3
-passlib==1.7.4
+libpass==1.9.3

setup.py

@@ -23,5 +23,5 @@
         "License v3 (LGPLv3)   License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
         "Operating System :: OS Independent",
     ],
-    python_requires = '>=3.7',
+    python_requires = '>=3.13',
 )

src/nethsec/snort/__init__.py

@@ -35,8 +35,6 @@
 duplicate signature IDs.
 """
 
-from __future__ import print_function
-
 import sys
 import re
 import logging

src/nethsec/utils/__init__.py

@@ -435,7 +435,7 @@ def get_user_by_username(uci, username):
       - The user object id (UCI section) if the user has been found, None otherwise
     '''
     users = get_all_by_type(uci, 'objects', 'user')
-    for user in get_all_by_type("users", "user"):
+    for user in get_all_by_type(uci, "users", "user"):
         if users[user].get("username", "") == username:
             users[user]["id"] = user
             return users[user]