Skip to content

Commit

Permalink
set upper python version limit to <3.12.4 and revise github workflows (
Browse files Browse the repository at this point in the history
…#614)

* set upper python version limit to <3.12.4 and revise github workflows

includes following changes:
- update CHANGELOG.md to include python version limitation
- build containers for 3.12.3
- split test workflow (unit,acceptance)
- increase wait time for http_input acceptance test and split test workflow (unit,acceptance)
  • Loading branch information
dtrai2 authored Jun 20, 2024
1 parent 7c9b2d1 commit 487634a
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 67 deletions.
34 changes: 2 additions & 32 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,8 @@ on:
types: [opened, synchronize]

jobs:

test:
runs-on: ubuntu-22.04

strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "pip"

- name: Install dependencies
run: |
pip install --upgrade pip wheel
pip install .[dev]
- name: Perform unit tests
env:
PYTEST_ADDOPTS: "--color=yes"
run: |
pytest -vv tests/unit
- name: Perform acceptance tests
env:
PYTEST_ADDOPTS: "--color=yes"
run: |
pytest -vv tests/acceptance
uses: ./.github/workflows/testing.yml

build-docs:
runs-on: ubuntu-22.04
Expand Down Expand Up @@ -117,7 +87,7 @@ jobs:
containerbuild:
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12.3"]

runs-on: ubuntu-latest
steps:
Expand Down
32 changes: 1 addition & 31 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,8 @@ on:
branches: [main]

jobs:

test:
runs-on: ubuntu-22.04

strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "pip"

- name: Install dependencies
run: |
pip install --upgrade pip wheel
pip install .[dev]
- name: Perform unit tests
env:
PYTEST_ADDOPTS: "--color=yes"
run: |
pytest -vv tests/unit
- name: Perform acceptance tests
env:
PYTEST_ADDOPTS: "--color=yes"
run: |
pytest -vv tests/acceptance
uses: ./.github/workflows/testing.yml

code-quality:
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-latest-dev-release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
containerbuild:
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12.3"]

runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
name: logprep-build
path: dist

publish-latest-release-to-pypi:
runs-on: ubuntu-latest
name: Publish release to PyPi
Expand All @@ -52,7 +52,7 @@ jobs:
containerbuild:
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11", "3.12.3"]

runs-on: ubuntu-latest
needs: publish-latest-release-to-pypi
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Testing

on:
workflow_call:

jobs:
python:
runs-on: ubuntu-22.04
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12.3"]
test-type: ["unit", "acceptance"]
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
cache: "pip"
- name: Install dependencies
run: |
pip install --upgrade pip wheel
pip install .[dev]
- name: Perform ${{ matrix.test-type }} test
env:
PYTEST_ADDOPTS: "--color=yes"
run: |
pytest -vv tests/${{ matrix.test-type }}
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,15 @@

## next release

This release limits the maximum python version to `3.12.3` because of the issue
[#612](https://github.com/fkie-cad/Logprep/issues/612).

### Breaking
### Features
### Improvements
* a result object was added which is returned by every processor
* includes generated extra_data, warnings and errors

### Bugfix

## 12.0.0
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fallback_version = "unset"
[project]
name = "logprep"
description = "Logprep allows to collect, process and forward log messages from various data sources."
requires-python = ">=3.10"
requires-python = ">=3.10,<3.12.4"
readme = "README.md"
dynamic = ["version"]
license = { file = "LICENSE" }
Expand Down

0 comments on commit 487634a

Please sign in to comment.