Skip to content
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e7e77f4
remove environment.yml; merge poetry.toml into pyproject.toml
ChrsBaur Feb 26, 2025
a9a9d48
adjust python version to be at least 3.9
ChrsBaur Feb 26, 2025
f61cc2f
adjust python version to be at least 3.9
ChrsBaur Feb 26, 2025
1585751
adjust github actions to only use poetry
ChrsBaur Feb 26, 2025
7314c04
adjust tests-poetry.yml
ChrsBaur Feb 26, 2025
8f82276
refactor(util): replace pkg_resources with importlib.resources
ChrsBaur Feb 26, 2025
1ca9655
Update dependency pytest-cov to v6
ChrsBaur Feb 26, 2025
cd10640
add test coverage report to github actions pipeline
ChrsBaur Feb 26, 2025
e886bec
fix pipeline
ChrsBaur Feb 26, 2025
b88b51b
Update dependency pre-commit to v4
ChrsBaur Feb 26, 2025
3b9de58
fix coverage
ChrsBaur Feb 26, 2025
c94c7d2
revert implementing coverage
ChrsBaur Feb 26, 2025
f5ef608
Update condaforge/mambaforge Docker tag to v24
ChrsBaur Feb 26, 2025
8f20a3a
Update actions/checkout action to v4
ChrsBaur Feb 26, 2025
05b8556
Update pre-commit hook pycqa/isort to v5.13.2
ChrsBaur Feb 26, 2025
4366b89
Update pre-commit hook pre-commit/pre-commit-hooks to v4.6.0
ChrsBaur Feb 26, 2025
c724148
Update pre-commit hook astral-sh/ruff-pre-commit to v0.9.7
ChrsBaur Feb 26, 2025
594f4a6
Update pre-commit hook asottile/pyupgrade to v3.19.1
ChrsBaur Feb 26, 2025
256daa4
update requirements.txt in cookiecutter slug
ChrsBaur Feb 26, 2025
a227d6c
make use of python 3.9 and newer
ChrsBaur Feb 26, 2025
28c5921
upgrade dependencies in pyproject.toml in cookiecutter project
ChrsBaur Feb 26, 2025
940ed6a
update and align conda environment-dev.yml and environment.yml with p…
ChrsBaur Feb 26, 2025
31eb25b
update versions of gitlab-ci-yml
ChrsBaur Feb 26, 2025
80c5234
fix test since black is installed by pip and whith a >= operator
ChrsBaur Feb 26, 2025
08bd253
add CHANGELOG.md entry and increase pyproject.toml version
ChrsBaur Feb 26, 2025
b20f087
improved description of CHANGELOG.md entry
ChrsBaur Feb 26, 2025
4b66ee4
git merge origin/master
ChrsBaur Feb 26, 2025
bfc94c0
rename CONTRIBUTION.md to CONTRIBUTING.md
ChrsBaur Feb 26, 2025
65ae91e
add actual badges to README.md
ChrsBaur Feb 27, 2025
624ce83
make some adjustments
ChrsBaur Feb 27, 2025
7aa65b5
update setuptools
ChrsBaur Feb 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 0 additions & 37 deletions .github/workflows/tests-conda.yml

This file was deleted.

52 changes: 0 additions & 52 deletions .github/workflows/tests-pip.yml

This file was deleted.

55 changes: 55 additions & 0 deletions .github/workflows/tests-poetry.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: pytest-poetry

on:
push:
branches:
- master
paths-ignore:
- '*.md'
pull_request:
branches:
- master
paths-ignore:
- '*.md'

jobs:
build:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: [3.9, 3.13]
os: [ubuntu-latest, windows-latest]
name: Test (Python ${{ matrix.python-version }} on ${{ matrix.os }})
steps:
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install Poetry
run: |
curl -sSL https://install.python-poetry.org | python3 -
shell: bash

- name: Add Poetry to PATH (non-Windows)
if: runner.os != 'Windows'
shell: bash
run: |
echo "$HOME/.local/bin" >> $GITHUB_PATH

- name: Add Poetry to PATH (Windows)
if: runner.os == 'Windows'
shell: pwsh
run: |
echo 'C:\Users\runneradmin\AppData\Roaming\Python\Scripts' >> $env:GITHUB_PATH

- name: Install dependencies
run: |
poetry install --no-interaction --no-root

- name: Test with pytest
run: |
poetry run pytest tests
2 changes: 1 addition & 1 deletion .github/workflows/traffic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v3
- uses: actions/checkout@v4
with:
ref: "traffic"

Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: 'v4.6.0'
hooks:
- id: check-added-large-files
- id: check-merge-conflict
Expand Down
31 changes: 30 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Placeholder for future updates and new features.
-

## [1.1.0] - 2025-02-26

### Added

- Adjusted Python version to be at least 3.9 in `pyproject.toml` and `environment-dev.yml`.
- Adjusted GitHub Actions to only use `poetry` for dependency management.
- Refactored utility code by replacing `pkg_resources` with `importlib.resources`.
- Added support for `pytest-cov` v6.
- Added test coverage reporting to the GitHub Actions pipeline.
- Updated Conda Docker tag to `v24` in `Dockerfile`.
- Updated `actions/checkout` GitHub action to v4.
- Updated pre-commit hooks, including:
- `pycqa/isort` to v5.13.2.
- `pre-commit/pre-commit-hooks` to v4.6.0.
- `astral-sh/ruff-pre-commit` to v0.9.7.
- `asottile/pyupgrade` to v3.19.1.
- Updated `requirements.txt` in the cookiecutter project.
- Made use of Python 3.9 and newer versions in `pyproject.toml`.
- Upgraded dependencies in `pyproject.toml` to ensure the project uses the latest versions.
- Updated and aligned `environment-dev.yml` and `environment.yml` with `pyproject.toml` for consistency.
- Updated versions of GitLab CI python and poetry versions.
- Fixed pre-commit hook for `black` installation via pip with the correct version constraint (`>=`).

### Fixed

- Fixed test since `black` is installed by pip, and updated the test to check for the correct version format (`>=`).
- Fixed coverage reporting integration in GitHub Actions.

## [1.0.1] - 2025-02-26

### Fixed
- **Conda package caching in GitLab CI:** Updated caching paths in `{{ cookiecutter.project_slug }}/.gitlab-ci.yml` to include the new `.conda` file format and additional cache directories. The updated paths now cache:
- `$PIP_CACHE_DIR`
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# AT Python Template

[![build](https://img.shields.io/github/actions/workflow/status/at-gmbh/at-python-template/tests-pip.yml?branch=master)](https://github.com/at-gmbh/at-python-template/actions?query=branch%3Amaster+)
![Python Version](https://img.shields.io/badge/python-3.8%20--%203.11-blue)
![Python Version](https://img.shields.io/badge/python-3.9%20--%203.13-blue)
[![License](https://img.shields.io/github/license/at-gmbh/at-python-template)](https://github.com/at-gmbh/at-python-template/blob/master/LICENSE)
![GitHub Repo stars](https://img.shields.io/github/stars/at-gmbh/at-python-template?style=social)

Expand Down Expand Up @@ -107,7 +107,7 @@ For more advanced Docker usage, please refer to the `Dockerfile` and `docker-com

## 🔗 Additional Dependencies

- Python 3.8 or higher is required.
- Python 3.9 or higher is required.
- Jupyter Lab: If you are planning to use Jupyter notebooks.
- This template requires `cookiecutter>=2.0`. If you experience issues installing it into your default conda environment, we recommend to create a new clean environment with nothing but the `cookiecutter` package installed.

Expand Down
14 changes: 0 additions & 14 deletions environment.yml

This file was deleted.

Loading