Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
seebi committed Aug 18, 2024
2 parents 16ce64d + 208994e commit d7c8a46
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ 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/)

## [6.4.0] 2024-08-18

### Changed

- dependency updates (ruff 0.5, pytest 8, pytest-cov 5)
- 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

### Security
Expand Down
4 changes: 2 additions & 2 deletions src/.github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 2 additions & 2 deletions src/.github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion src/Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/pyproject.toml.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.1"
pip = "^24"
pytest = "^7.4.4"
pytest-cov = "^4.1.0"
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.4.4"
pytest-memray = { version = "^1.7.0", markers = "platform_system != 'Windows'" }
ruff = "^0.6.1"
safety = "^1.10.3"

[build-system]
Expand Down
2 changes: 1 addition & 1 deletion src/tests/test_example.py.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit d7c8a46

Please sign in to comment.