Skip to content

Commit bbe958f

Browse files
authored
Merge pull request #46 from certtools/aaronkaplan_pre-rel_3.3.0
Aaronkaplan pre rel 3.3.0
2 parents 16bfb91 + bf4e80a commit bbe958f

File tree

11 files changed

+37
-22
lines changed

11 files changed

+37
-22
lines changed

.github/workflows/code_style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525

2626
- name: Set up Python
2727
uses: actions/setup-python@v4

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3030
- name: Initialize CodeQL
3131
uses: github/codeql-action/init@v1
3232
with:

.github/workflows/debian-package.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,18 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v4
2020

21-
- name: Debian package action test
22-
uses: schacht-certat/action-build-on-debian@v3
23-
with:
24-
codename: ${{ matrix.codename }}
21+
# this does not currently work:
22+
# - name: Debian package action test
23+
# uses: schacht-certat/action-build-on-debian@v4
24+
# with:
25+
# codename: ${{ matrix.codename }}
2526

26-
- name: Upload artifacts
27-
uses: actions/upload-artifact@v2
28-
with:
29-
name: debian-package-${{ matrix.codename }}-${{ github.sha }}
30-
path: '~/artifacts'
31-
retention-days: 5
27+
# therefore, also this won't make sense:
28+
# - name: Upload artifacts
29+
# uses: actions/upload-artifact@v4
30+
# with:
31+
# name: debian-package-${{ matrix.codename }}-${{ github.sha }}
32+
# path: '~/artifacts'
33+
# retention-days: 5

.github/workflows/mypy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2626
- name: Set up Python ${{ matrix.python-version }}
27-
uses: actions/setup-python@v2
27+
uses: actions/setup-python@v4
2828
with:
2929
python-version: ${{ matrix.python-version }}
3030
- name: Install dependencies

.github/workflows/python-unittests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2626
- name: Set up Python ${{ matrix.python-version }}
27-
uses: actions/setup-python@v2
27+
uses: actions/setup-python@v4
2828
with:
2929
python-version: ${{ matrix.python-version }}
3030
- name: Install dependencies

.github/workflows/reuse.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2626
- name: REUSE compliance check
27-
uses: fsfe/reuse-action@v1
27+
uses: fsfe/reuse-action@v2

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
CHANGELOG
66
=========
77

8+
3.3.0 (2024-03-01)
9+
----------------------
10+
11+
- Bump version number to be in sync with the main intelmq version
12+
- minor fixes to re-enable all the github workflows and disable the workflows which did not run anymore.
13+
814
3.2.0 (2023-07-19)
915
----------------------
1016

README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
intelmq-api
77
###########
88

9+
910
|Tests Status| |Package Status|
1011

1112
.. |Tests Status| image:: https://github.com/certtools/intelmq-api/actions/workflows/python-unittests.yml/badge.svg

debian/changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
intelmq-api (3.3.0-1) stable; urgency=medium
2+
3+
* Update to 3.3.0 - mere bump of version
4+
5+
-- Aaron Kaplan <[email protected]> Fr, 01 Mar 2024 14:19:00 +0100
6+
17
intelmq-api (3.2.0-1) stable; urgency=medium
28

39
[ Kamil Mankowski ]

intelmq_api/exceptions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ def handle_generic_error(request: Request, exc: StarletteHTTPException):
2121

2222
def register(app: FastAPI):
2323
"""A hook to register handlers in the app. Need to be called before startup"""
24-
app.add_exception_handler(runctl.IntelMQCtlError, ctl_error_handler)
25-
app.add_exception_handler(StarletteHTTPException, handle_generic_error)
24+
app.add_exception_handler(runctl.IntelMQCtlError, ctl_error_handler) # type: ignore
25+
app.add_exception_handler(StarletteHTTPException, handle_generic_error) # type: ignore

intelmq_api/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
SPDX-FileCopyrightText: 2020-2023 Birger Schacht, Sebastian Wagner
44
SPDX-License-Identifier: AGPL-3.0-or-later
55
"""
6-
__version_info__ = (3, 2, 0)
6+
__version_info__ = (3, 3, 0)
77
__version__ = '.'.join(map(str, __version_info__))

0 commit comments

Comments
 (0)