From 7a52a90b85da004f11a1d086d89efc861e567362 Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Thu, 18 Jul 2024 16:30:45 +0200 Subject: [PATCH 1/8] bump versions --- src/pyproject.toml.jinja | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pyproject.toml.jinja b/src/pyproject.toml.jinja index fc8f107..69db6fd 100644 --- a/src/pyproject.toml.jinja +++ b/src/pyproject.toml.jinja @@ -20,19 +20,19 @@ keywords = [ python = "^3.11" [tool.poetry.dependencies.cmem-plugin-base] -version = "^4.5.0" +version = "^4.7.0" allow-prereleases = false [tool.poetry.group.dev.dependencies] genbadge = {extras = ["coverage"], version = "^1.1.1"} -mypy = "^1.10.0" +mypy = "^1.10.1" pip = "^24" -pytest = "^7.4.4" -pytest-cov = "^4.1.0" +pytest = "^8.2.2" +pytest-cov = "^5.0.0" pytest-dotenv = "^0.5.2" pytest-html = "^4.1.1" pytest-memray = { version = "^1.6.0", markers = "platform_system != 'Windows'" } -ruff = "^0.4.4" +ruff = "^0.5.2" safety = "^1.10.3" [build-system] From a59cc59078f9008c6bcc04277bf8779d4775016c Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Thu, 18 Jul 2024 16:34:47 +0200 Subject: [PATCH 2/8] use new output-format option --- src/Taskfile.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Taskfile.yaml b/src/Taskfile.yaml index c565507..a0712c5 100644 --- a/src/Taskfile.yaml +++ b/src/Taskfile.yaml @@ -156,7 +156,7 @@ tasks: <<: *preparation cmds: - poetry run ruff check --exit-zero tests {{.PACKAGE}} {{.XML_PARAMS}} - - poetry run ruff check --show-source tests {{.PACKAGE}} + - poetry run ruff check --output-format=concise tests {{.PACKAGE}} - poetry run ruff format --check tests {{.PACKAGE}} vars: JUNIT_FILE: ./{{.DIST_DIR}}/junit-ruff.xml From 7bb0c3277a7e32a82aed348f66fe3867fa6886cf Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Thu, 18 Jul 2024 16:40:39 +0200 Subject: [PATCH 3/8] change log --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 135edcc..7efe3dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ## [Unreleased] -TODO: add at least one Added, Changed, Deprecated, Removed, Fixed or Security section +### Changed + +- dependency updates (ruff 0.5, pytest 8, pytest-cov 5) +- cmem-plugin-base -> 4.7.0 ## [6.3.1] 2024-06-03 From 09046808358100df6e687e5afa7c10d900b049a5 Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Tue, 23 Jul 2024 16:01:40 +0200 Subject: [PATCH 4/8] update setup task and python actions to avoid nodejs warning https://github.blog/changelog/2024-03-07-github-actions-all-actions-will-run-on-node20-instead-of-node16-by-default/ --- CHANGELOG.md | 4 +++- src/.github/workflows/check.yml | 4 ++-- src/.github/workflows/publish.yml | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7efe3dd..45c8fd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p ### Changed - dependency updates (ruff 0.5, pytest 8, pytest-cov 5) -- cmem-plugin-base -> 4.7.0 +- cmem-plugin-base -> 4.7.0 (Corporate Memory 24.2.x) +- github: update to actions/setup-python@v5 +- github: update to arduino/setup-task@v2 ## [6.3.1] 2024-06-03 diff --git a/src/.github/workflows/check.yml b/src/.github/workflows/check.yml index d5bd94d..96879bf 100644 --- a/src/.github/workflows/check.yml +++ b/src/.github/workflows/check.yml @@ -23,11 +23,11 @@ jobs: uses: actions/checkout@v4 - name: Install Task - uses: arduino/setup-task@v1 + uses: arduino/setup-task@v2 - name: Set up python id: setup-python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' diff --git a/src/.github/workflows/publish.yml b/src/.github/workflows/publish.yml index 664ec5e..24a4756 100644 --- a/src/.github/workflows/publish.yml +++ b/src/.github/workflows/publish.yml @@ -20,11 +20,11 @@ jobs: uses: actions/checkout@v4 - name: Install Task - uses: arduino/setup-task@v1 + uses: arduino/setup-task@v2 - name: Set up python id: setup-python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11' From 2e9bfa7caa58c44360c44058392efe1a25d52543 Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Sun, 18 Aug 2024 15:16:43 +0200 Subject: [PATCH 5/8] update dependencies --- src/pyproject.toml.jinja | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pyproject.toml.jinja b/src/pyproject.toml.jinja index 69db6fd..ca3daf6 100644 --- a/src/pyproject.toml.jinja +++ b/src/pyproject.toml.jinja @@ -25,14 +25,14 @@ allow-prereleases = false [tool.poetry.group.dev.dependencies] genbadge = {extras = ["coverage"], version = "^1.1.1"} -mypy = "^1.10.1" +mypy = "^1.11.1" pip = "^24" -pytest = "^8.2.2" +pytest = "^8.3.2" pytest-cov = "^5.0.0" pytest-dotenv = "^0.5.2" pytest-html = "^4.1.1" -pytest-memray = { version = "^1.6.0", markers = "platform_system != 'Windows'" } -ruff = "^0.5.2" +pytest-memray = { version = "^1.7.0", markers = "platform_system != 'Windows'" } +ruff = "^0.6.1" safety = "^1.10.3" [build-system] From 068ab92e9d3b823b48d04bf5a26a29b767cbbb5f Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Sun, 18 Aug 2024 15:17:46 +0200 Subject: [PATCH 6/8] fix new ruff issues --- src/tests/test_example.py.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/test_example.py.jinja b/src/tests/test_example.py.jinja index cb7d2b5..2db61c1 100644 --- a/src/tests/test_example.py.jinja +++ b/src/tests/test_example.py.jinja @@ -20,7 +20,7 @@ RESOURCE_NAME = "sample_dataset.txt" DATASET_TYPE = "text" -@pytest.fixture() +@pytest.fixture def di_environment() -> object: """Provide the DI build project incl. assets.""" make_new_project(PROJECT_NAME) From b31b43c04e5f7fe7b83b203aba55e0fdf84423c2 Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Sun, 18 Aug 2024 15:18:58 +0200 Subject: [PATCH 7/8] change log --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45c8fd8..1ee85da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/) -## [Unreleased] +## [6.4.0] 2024-08-18 ### Changed From 208994e30672ae4f9d9f7ef04dfabc032678a75d Mon Sep 17 00:00:00 2001 From: Sebastian Tramp Date: Sun, 18 Aug 2024 15:20:55 +0200 Subject: [PATCH 8/8] update actions to avoid node warning --- .github/workflows/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 08da781..f4b433e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -26,13 +26,13 @@ jobs: uses: actions/checkout@v4 - name: Install Task - uses: arduino/setup-task@v1 + uses: arduino/setup-task@v2 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Set up python id: setup-python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: '3.11'