From 487634a8154575900eebbb50b405d92e4d5e8549 Mon Sep 17 00:00:00 2001 From: dtrai2 <95028228+dtrai2@users.noreply.github.com> Date: Thu, 20 Jun 2024 14:42:21 +0200 Subject: [PATCH] set upper python version limit to <3.12.4 and revise github workflows (#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) --- .github/workflows/ci.yml | 34 ++----------------- .github/workflows/main.yml | 32 +---------------- .../publish-latest-dev-release-to-pypi.yml | 2 +- .github/workflows/publish-release-to-pypi.yml | 4 +-- .github/workflows/testing.yml | 28 +++++++++++++++ CHANGELOG.md | 6 ++++ pyproject.toml | 2 +- 7 files changed, 41 insertions(+), 67 deletions(-) create mode 100644 .github/workflows/testing.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85c4265fc..b580d89d5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 @@ -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: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1d6bc83b1..4c971e7bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -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 diff --git a/.github/workflows/publish-latest-dev-release-to-pypi.yml b/.github/workflows/publish-latest-dev-release-to-pypi.yml index f1e354c92..d4fa4ed5d 100644 --- a/.github/workflows/publish-latest-dev-release-to-pypi.yml +++ b/.github/workflows/publish-latest-dev-release-to-pypi.yml @@ -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: diff --git a/.github/workflows/publish-release-to-pypi.yml b/.github/workflows/publish-release-to-pypi.yml index 17c7aff02..e9cfe1815 100644 --- a/.github/workflows/publish-release-to-pypi.yml +++ b/.github/workflows/publish-release-to-pypi.yml @@ -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 @@ -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 diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml new file mode 100644 index 000000000..50606b9a9 --- /dev/null +++ b/.github/workflows/testing.yml @@ -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 }} diff --git a/CHANGELOG.md b/CHANGELOG.md index c0c848b95..6960591ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/pyproject.toml b/pyproject.toml index 102d2279c..7a7714639 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" }