Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aaronkaplan pre rel 3.3.0 #46

Merged
merged 15 commits into from
Mar 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/code_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
24 changes: 13 additions & 11 deletions .github/workflows/debian-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines -21 to +33
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

4 changes: 2 additions & 2 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reuse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)
----------------------

Expand Down
1 change: 1 addition & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
intelmq-api (3.3.0-1) stable; urgency=medium

* Update to 3.3.0 - mere bump of version

-- Aaron Kaplan <[email protected]> Fr, 01 Mar 2024 14:19:00 +0100

intelmq-api (3.2.0-1) stable; urgency=medium

[ Kamil Mankowski ]
Expand Down
4 changes: 2 additions & 2 deletions intelmq_api/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion intelmq_api/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__))
Loading