git merge origin/master

ChrsBaur · ChrsBaur · commit 10c13068c68d · 2025-12-23T20:58:53.000+01:00
diff --git a/.github/workflows/tests-poetry.yml b/.github/workflows/tests-poetry.yml
@@ -22,7 +22,7 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     name: Test (Python ${{ matrix.python-version }} on ${{ matrix.os }})
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
diff --git a/.github/workflows/traffic.yml b/.github/workflows/traffic.yml
@@ -14,7 +14,7 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
     # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
       with:
         ref: "traffic"
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 'v5.0.0'
+    rev: 'v6.0.0'
     hooks:
     -   id: check-added-large-files
     -   id: check-merge-conflict
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Placeholder for future updates and new features.
 
+## [1.2.2] - 2025-08-22
+### Changed
+- Aktualisiert: pre-commit Hook `astral-sh/ruff-pre-commit` von `v0.11.12` auf `v0.12.10`.
+- Aktualisiert: pre-commit Hook `pycqa/isort` von `v5.13.2` auf `v6.0.1`.
+- Aktualisiert: Abhängigkeit `typer` von `0.16.0` auf `0.16.1`.
+- Aktualisiert: Dev-Abhängigkeit `pytest` von `8.4.0` auf `8.4.1`.
+- Updated pre-commit hook `astral-sh/ruff-pre-commit` from `v0.11.12` to `v0.12.10`.
+- Updated pre-commit hook `pycqa/isort` from `v5.13.2` to `v6.0.1`.
+- Updated dependency `typer` from `0.16.0` to `0.16.1`.
+- Updated dev dependency `pytest` from `8.4.0` to `8.4.1`.
+- Updated lock file (`poetry.lock`) to reflect new version states.
+
+## [1.2.1] - 2025-06-05
+### Changed
+
+- Updated pytest from 8.3.4 to 8.4
+- Updated typer from 0.15.1 to 0.16.0
+- Updated pre-commit hook assotile/pyugrade from v3.19.1 to v3.20.0
+- Updated setuptools from 76.0.0 to 80.9.0
+- Updated Python Docker tags from 3.11-slim-bookworm to 3.13-slim-bookworm and 3.11-bullseye to 3.13-bullseye
+- Updated pre-commit ruff from v0.11.0 to v0.11.12
 
 ## [1.2.0] - 2025-04-09
 
@@ -124,5 +145,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ---
 
-[Unreleased]: https://github.com/at-gmbh/at-python-template/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/at-gmbh/at-python-template/compare/v1.2.2...HEAD
+[1.2.2]: https://github.com/at-gmbh/at-python-template/compare/v1.2.1...v1.2.2
+[1.2.1]: https://github.com/at-gmbh/at-python-template/compare/v1.2.0...v1.2.1
+[1.2.0]: https://github.com/at-gmbh/at-python-template/compare/v1.1.1...v1.2.0
+[1.1.1]: https://github.com/at-gmbh/at-python-template/compare/v1.1.0...v1.1.1
+[1.1.0]: https://github.com/at-gmbh/at-python-template/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/at-gmbh/at-python-template/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/at-gmbh/at-python-template/releases/tag/v1.0.0
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "at-python-template"
-version = "1.2.0"
+version = "1.2.2"
 description = "This is the official Python Project Template of Alexander Thamm GmbH (AT)"
 authors = [
     "Christian Baur <christian.baur@alexanderthamm.com>",
@@ -17,16 +17,16 @@ packages = [{ include = "{{cookiecutter.module_name}}", from = "{{cookiecutter.p
 [tool.poetry.dependencies]
 python = "^3.9"
 cookiecutter = "^2.3"
-pre-commit = "^4.2.0"
-pytest-mock = "^3.14.1"
+pre-commit = "^4.3.0"
+pytest-mock = "^3.12"
 pyhocon = "^0.3.60"
 pyyaml = "^6.0"
-typer = "^0.16.0"
+typer = "^0.16.1"
 setuptools = "^80.9.0"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "^8.3.5"
-pytest-cov = "^6.0.0"
+pytest = "^8.4.1"
+pytest-cov = "^6.2.1"
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: 'v5.0.0'
+    rev: 'v6.0.0'
     hooks:
       - id: check-added-large-files
       - id: check-ast
@@ -19,15 +19,15 @@ repos:
         language_version: python3.9
         exclude: ^notebooks{% else %}
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.11.0'
+    rev: 'v0.12.10'
     hooks:
       - id: ruff{% endif %}
   - repo: https://github.com/pycqa/isort
     rev: '6.0.1'
     hooks:
       - id: isort
   - repo: https://github.com/asottile/pyupgrade
-    rev: 'v3.19.1'
+    rev: 'v3.20.0'
     hooks:
       - id: pyupgrade
-        args: [ --py38-plus ]
+        args: [ --py39-plus ]
diff --git a/{{cookiecutter.project_slug}}/Dockerfile__pip b/{{cookiecutter.project_slug}}/Dockerfile__pip
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.11
+ARG PYTHON_VERSION=3.13
 FROM python:${PYTHON_VERSION}-bullseye
 LABEL maintainer="{{ cookiecutter.company_name if cookiecutter.company_name else cookiecutter.full_name }}"
 
diff --git a/{{cookiecutter.project_slug}}/Dockerfile__poetry b/{{cookiecutter.project_slug}}/Dockerfile__poetry
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.11
+ARG PYTHON_VERSION=3.13
 FROM python:${PYTHON_VERSION}-bullseye
 LABEL maintainer="{{ cookiecutter.company_name if cookiecutter.company_name else cookiecutter.full_name }}"
 
diff --git a/{{cookiecutter.project_slug}}/Dockerfile__uv b/{{cookiecutter.project_slug}}/Dockerfile__uv
@@ -12,7 +12,7 @@ COPY ./src /app/src
 
 RUN uv sync --frozen && uv cache clean
 
-FROM python:3.11-slim-bookworm
+FROM python:3.13-slim-bookworm
 
 WORKDIR /app
 
diff --git a/{{cookiecutter.project_slug}}/environment-dev.yml b/{{cookiecutter.project_slug}}/environment-dev.yml
@@ -8,9 +8,9 @@ channels:
 
 dependencies:
   - python>=3.9
-  - pytest>=8.3.4
-  - pytest-cov>=6.0.0
-  - pre-commit>=4.1.0
+  - pytest>=8.4.1
+  - pytest-cov>=6.2.1
+  - pre-commit>=4.3.0
   - isort>=6.0.0{% if cookiecutter.use_notebooks == 'yes' %}
   - jupyterlab>=4.3.5{% endif %}
   - pip{% if cookiecutter.code_formatter == 'black' %}
diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml
@@ -16,13 +16,13 @@ pyhocon = "^0.3.59"
 PyYAML = "^6.0"
 {%- endif %}
 {%- if cookiecutter.create_cli == 'yes' %}
-typer = "^0.15.1"
+typer = "^0.16.1"
 {{ cookiecutter.project_slug }} = "{{ cookiecutter.module_name }}.main:app"
 {%- endif %}
 
 [tool.poetry.group.test.dependencies]
-pytest = "^8.3.4"
-pytest-cov = "^6.0.0"
+pytest = "^8.4.1"
+pytest-cov = "^6.2.1"
 
 [tool.poetry.group.linter.dependencies]
 {%- if cookiecutter.code_formatter == 'black' %}
@@ -32,9 +32,6 @@ ruff = "^0.12.2"
 {%- endif %}
 isort = "^5.12.0"
 
-[tool.poetry.extras]
-build = ["setuptools", "cython"]
-
 [tool.poetry.group.dev.dependencies]
 pre-commit = "^4.1.0"{% if cookiecutter.use_notebooks == 'yes' %}
 jupyterlab = "^4.3.5"{% endif %}
@@ -47,6 +44,14 @@ target-version = "py39"
 exclude = ["__init__.py"]
 extend-exclude = ["notebooks/*"]
 
+[tool.poetry.extras]
+build = ["setuptools", "cython"]
+
+[tool.poetry.scripts]
+{%- if cookiecutter.create_cli == "yes" %}
+{{ cookiecutter.project_slug }} = "{{ cookiecutter.module_name }}.main:app"
+{%- endif %}
+
 [tool.ruff.lint]
 select = [
     "E",  # Pycodestyle errors
@@ -69,13 +74,13 @@ multi_line_output = 3{% endif %}
 minversion = "7.0"
 testpaths = ["tests"]
 
+[tool.uv]
+default-groups = ["dev", "test", "linter"]
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.uv]
-default-groups = ["dev", "test", "linter"]
-
 {%- else %}[project]
 name = "{{ cookiecutter.project_slug }}"
 version = "0.1.0"
@@ -89,7 +94,7 @@ dependencies = [
 "PyYAML>=6.0",
 {%- endif %}
 {%- if cookiecutter.create_cli == 'yes' %}
-"typer>=0.15.1",
+"typer>=0.16.1",
 {%- endif %}
 ]
 
@@ -111,7 +116,7 @@ hello_gui = "{{ cookiecutter.module_name }}.gui:main"
 a = "{{ cookiecutter.module_name }}_plugin_a"
 
 [dependency-groups]
-dev = ["pre-commit>=3.0"{% if cookiecutter.use_notebooks == 'yes' %}, "jupyterlab>=3.5"{% endif %}]
+dev = ["pre-commit>=4.3.0"{% if cookiecutter.use_notebooks == 'yes' %}, "jupyterlab>=3.5"{% endif %}]
 linter = [
 {%- if cookiecutter.code_formatter == 'black' %}
 "black>=25.1.0",
@@ -120,7 +125,7 @@ linter = [
 {%- endif %}
 "isort>=5.12.0"
 ]
-test = ["pytest>=8.3.4", "pytest-cov>=6.0"]
+test = ["pytest>=8.4.1", "pytest-cov>=6.2.1"]
 
 [tool.isort]
 {%- if cookiecutter.code_formatter == 'black' %}
diff --git a/{{cookiecutter.project_slug}}/requirements-dev.txt b/{{cookiecutter.project_slug}}/requirements-dev.txt
@@ -6,9 +6,9 @@ black~=25.1.0
 {% elif cookiecutter.code_formatter == 'ruff' %}
 ruff~=0.12.2
 {% endif %}
-pre-commit~=4.1
-pytest~=8.3.5
-pytest-cov~=6.0
+pre-commit~=4.3.0
+pytest~=8.4.1
+pytest-cov~=6.2.1
 wheel~=0.45.1
 {% if cookiecutter.code_formatter == 'none' or cookiecutter.code_formatter == 'black' %}
 isort~=5.12.0
diff --git a/{{cookiecutter.project_slug}}/requirements.txt b/{{cookiecutter.project_slug}}/requirements.txt
@@ -14,5 +14,5 @@ PyYAML~=6.0.2
 # Dependency for Command-Line Interface (CLI) if enabled
 {% if cookiecutter.create_cli == 'yes' %}
 # CLI framework (with optional dependencies for enhanced functionality)
-typer~=0.15.1
+typer~=0.16.1
 {% endif %}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-ARG PYTHON_VERSION=3.11`
	`1`	`+ARG PYTHON_VERSION=3.13`
`2`	`2`	`FROM python:${PYTHON_VERSION}-bullseye`
`3`	`3`	`LABEL maintainer="{{ cookiecutter.company_name if cookiecutter.company_name else cookiecutter.full_name }}"`
`4`	`4`