Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: at-gmbh/at-python-template
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.1
Choose a base ref
...
head repository: at-gmbh/at-python-template
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.0
Choose a head ref

Commits on Feb 26, 2025

  1. Copy the full SHA
    e7e77f4 View commit details
  2. Copy the full SHA
    a9a9d48 View commit details
  3. Copy the full SHA
    f61cc2f View commit details
  4. Copy the full SHA
    1585751 View commit details
  5. adjust tests-poetry.yml

    ChrsBaur committed Feb 26, 2025
    Copy the full SHA
    7314c04 View commit details
  6. refactor(util): replace pkg_resources with importlib.resources

    - Use `importlib.resources` instead of deprecated `pkg_resources`.
    - Ensures compatibility with Python 3.9+.
    - Fixes deprecation warnings in `util.py`.
    ChrsBaur committed Feb 26, 2025
    Copy the full SHA
    8f82276 View commit details
  7. Copy the full SHA
    1ca9655 View commit details
  8. Copy the full SHA
    cd10640 View commit details
  9. fix pipeline

    ChrsBaur committed Feb 26, 2025
    Copy the full SHA
    e886bec View commit details
  10. Copy the full SHA
    b88b51b View commit details
  11. fix coverage

    ChrsBaur committed Feb 26, 2025
    Copy the full SHA
    3b9de58 View commit details
  12. revert implementing coverage

    ChrsBaur committed Feb 26, 2025
    Copy the full SHA
    c94c7d2 View commit details
  13. Copy the full SHA
    f5ef608 View commit details
  14. Copy the full SHA
    8f20a3a View commit details
  15. Copy the full SHA
    05b8556 View commit details
  16. Copy the full SHA
    4366b89 View commit details
  17. Copy the full SHA
    c724148 View commit details
  18. Copy the full SHA
    594f4a6 View commit details
  19. Copy the full SHA
    256daa4 View commit details
  20. Copy the full SHA
    a227d6c View commit details
  21. Copy the full SHA
    28c5921 View commit details
  22. Copy the full SHA
    940ed6a View commit details
  23. Copy the full SHA
    31eb25b View commit details
  24. Copy the full SHA
    80c5234 View commit details
  25. Copy the full SHA
    08bd253 View commit details
  26. Copy the full SHA
    b20f087 View commit details
  27. git merge origin/master

    ChrsBaur committed Feb 26, 2025
    Copy the full SHA
    4b66ee4 View commit details
  28. Copy the full SHA
    bfc94c0 View commit details

Commits on Feb 27, 2025

  1. Copy the full SHA
    65ae91e View commit details
  2. make some adjustments

    ChrsBaur committed Feb 27, 2025
    Copy the full SHA
    624ce83 View commit details
  3. update setuptools

    ChrsBaur committed Feb 27, 2025
    Copy the full SHA
    7aa65b5 View commit details
  4. Merge pull request #151 from at-gmbh/feature/dependency-care-taking

    Feature/dependency care taking
    ChrsBaur authored Feb 27, 2025
    Copy the full SHA
    1000086 View commit details
  5. Update README.md

    ChrsBaur authored Feb 27, 2025
    Copy the full SHA
    bcbbdcd View commit details
  6. Copy the full SHA
    c74772e View commit details
  7. Merge pull request #152 from at-gmbh/feature/renovate-configuration/p…

    …re-commit-pre-commit-hooks-5.x
    
    Update pre-commit hook pre-commit/pre-commit-hooks to v5
    ChrsBaur authored Feb 27, 2025
    Copy the full SHA
    ebfa657 View commit details
  8. Copy the full SHA
    666f076 View commit details
  9. Merge pull request #153 from at-gmbh/feature/renovate-configuration/p…

    …ycqa-isort-6.x
    
    Update pre-commit hook pycqa/isort to v6
    ChrsBaur authored Feb 27, 2025
    Copy the full SHA
    b55c54f View commit details
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
@@ -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"

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: 'v5.0.0'
hooks:
- id: check-added-large-files
- id: check-merge-conflict
31 changes: 30 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`
File renamed without changes.
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
# 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)
[![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.9%20--%203.13-blue)
[![Latest Version](https://img.shields.io/github/v/tag/at-gmbh/at-python-template?label=version&sort=semver)](https://github.com/at-gmbh/at-python-template/releases)
[![Commit Activity](https://img.shields.io/github/commit-activity/m/at-gmbh/at-python-template)](https://github.com/at-gmbh/at-python-template/commits/master)
[![Dependencies](https://img.shields.io/librariesio/github/at-gmbh/at-python-template)](https://libraries.io/github/at-gmbh/at-python-template)
[![Open Issues](https://img.shields.io/github/issues/at-gmbh/at-python-template)](https://github.com/at-gmbh/at-python-template/issues)
[![Contributors](https://img.shields.io/github/contributors/at-gmbh/at-python-template)](https://github.com/at-gmbh/at-python-template/graphs/contributors)
[![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)
[![Last Commit](https://img.shields.io/github/last-commit/at-gmbh/at-python-template)](https://github.com/at-gmbh/at-python-template/commits/master)



This is the official Python Project Template of Alexander Thamm GmbH (AT). It is built with [cookiecutter](https://cookiecutter.readthedocs.io/) and inspired by [cookiecutter-data-science](https://github.com/drivendata/cookiecutter-data-science). It is designed to bridge the gap between exploratory work and production-ready projects. The goal is to be able to quickly bootstrap a Python project that provides lots of useful stuff to build, test & deploy your code without being overly convoluted like many of the publicly available packages.

@@ -107,7 +114,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.

@@ -197,7 +204,7 @@ You may find lots of other templates under the [cookiecutter-template](https://g

## License

Copyright 2020 Alexander Thamm GmbH
Copyright 2025 Alexander Thamm GmbH

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
14 changes: 0 additions & 14 deletions environment.yml

This file was deleted.

Loading