Merge pull request #46 from certtools/aaronkaplan_pre-rel_3.3.0

Aaronkaplan pre rel 3.3.0

.github/workflows/code_style.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4

.github/workflows/codeql-analysis.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1
       with:

.github/workflows/debian-package.yml

@@ -16,16 +16,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Debian package action test
-      uses: schacht-certat/action-build-on-debian@v3
-      with:
-        codename: ${{ matrix.codename }}
+    # this does not currently work:
+    # - name: Debian package action test
+    #  uses: schacht-certat/action-build-on-debian@v4
+    #  with:
+    #    codename: ${{ matrix.codename }}
 
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: debian-package-${{ matrix.codename }}-${{ github.sha }}
-        path: '~/artifacts'
-        retention-days: 5
+    # therefore, also this won't make sense:
+    # - name: Upload artifacts
+    #  uses: actions/upload-artifact@v4
+    #  with:
+    #    name: debian-package-${{ matrix.codename }}-${{ github.sha }}
+    #    path: '~/artifacts'
+    #    retention-days: 5

.github/workflows/mypy.yml

@@ -22,9 +22,9 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/python-unittests.yml

@@ -22,9 +22,9 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/reuse.yml

@@ -22,6 +22,6 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: REUSE compliance check
-      uses: fsfe/reuse-action@v1
+      uses: fsfe/reuse-action@v2

CHANGELOG.rst

@@ -5,6 +5,12 @@
 CHANGELOG
 =========
 
+3.3.0 (2024-03-01)
+----------------------
+
+- Bump version number to be in sync with the main intelmq version 
+- minor fixes to re-enable all the github workflows and disable the workflows which did not run anymore.
+
 3.2.0 (2023-07-19)
 ----------------------
 

README.rst

@@ -6,6 +6,7 @@
 intelmq-api
 ###########
 
+
 |Tests Status| |Package Status|
 
 .. |Tests Status| image:: https://github.com/certtools/intelmq-api/actions/workflows/python-unittests.yml/badge.svg

debian/changelog

@@ -1,3 +1,9 @@
+intelmq-api (3.3.0-1) stable; urgency=medium
+
+  * Update to 3.3.0 - mere bump of version 
+
+ -- Aaron Kaplan <aaron@lo-res.org>  Fr, 01 Mar 2024 14:19:00 +0100
+
 intelmq-api (3.2.0-1) stable; urgency=medium
 
   [ Kamil Mankowski ]

intelmq_api/exceptions.py

@@ -21,5 +21,5 @@ def handle_generic_error(request: Request, exc: StarletteHTTPException):
 
 def register(app: FastAPI):
     """A hook to register handlers in the app. Need to be called before startup"""
-    app.add_exception_handler(runctl.IntelMQCtlError, ctl_error_handler)
-    app.add_exception_handler(StarletteHTTPException, handle_generic_error)
+    app.add_exception_handler(runctl.IntelMQCtlError, ctl_error_handler)      # type: ignore
+    app.add_exception_handler(StarletteHTTPException, handle_generic_error)   # type: ignore

intelmq_api/version.py

@@ -3,5 +3,5 @@
 SPDX-FileCopyrightText: 2020-2023 Birger Schacht, Sebastian Wagner
 SPDX-License-Identifier: AGPL-3.0-or-later
 """
-__version_info__ = (3, 2, 0)
+__version_info__ = (3, 3, 0)
 __version__ = '.'.join(map(str, __version_info__))