Skip to content

Commit cdd1b67

Browse files
authored
Merge pull request #97 from jerry-git/cruft-update-6-2024
Cruft update 6/2024
2 parents 5dd794d + eb837ac commit cdd1b67

19 files changed

+598
-684
lines changed

.cruft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/woltapp/wolt-python-package-cookiecutter",
3-
"commit": "4eecc9c4d27e3c9321438bc1fdaf717bec5eadf6",
3+
"commit": "ef35f9eae64cee9e05dfc13d68a386de845407d1",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

.github/actions/python-poetry-env/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ inputs:
55
python-version:
66
required: false
77
description: 'Python version'
8-
default: '3.10'
8+
default: '3.12'
99
outputs: {}
1010
runs:
1111
using: 'composite'
1212
steps:
13-
- uses: actions/setup-python@v4
13+
- uses: actions/setup-python@v5
1414
with:
1515
python-version: ${{inputs.python-version}}
1616
- name: Install poetry

.github/workflows/cookiecutter.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
auto-update-project:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
- name: Set up Python
13-
uses: actions/setup-python@v4
13+
uses: actions/setup-python@v5
1414
with:
15-
python-version: 3.9
15+
python-version: "3.12"
1616

1717
- name: Install dependencies
1818
run: python -m pip install cruft poetry jello tabulate

.github/workflows/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
auto-update-dependencies:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
- uses: ./.github/actions/python-poetry-env
1313

1414
- name: Install tabulate

.github/workflows/draft_release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
draft-release:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- uses: ./.github/actions/python-poetry-env
1717
- name: Update version
1818
id: updated_version

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
build-and-publish:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
- uses: ./.github/actions/python-poetry-env
1313
- name: Publish to pypi
1414
run: |

.github/workflows/test.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
actionlint:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v4
1414
- name: Download actionlint
1515
run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash) 1.6.21
1616
shell: bash
@@ -22,14 +22,14 @@ jobs:
2222
name: Check if automatic project update was successful
2323
runs-on: ubuntu-latest
2424
steps:
25-
- uses: actions/checkout@v2
25+
- uses: actions/checkout@v4
2626
- name: Fail if .rej files exist as structure update was not successful
2727
run: test -z "$(find . -iname '*.rej')"
2828

2929
pre-commit:
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@v2
32+
- uses: actions/checkout@v4
3333
- uses: ./.github/actions/python-poetry-env
3434
- run: poetry run pre-commit run --all-files
3535

@@ -38,10 +38,17 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
41+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
4242
steps:
43-
- uses: actions/checkout@v2
43+
- uses: actions/checkout@v4
4444
- uses: ./.github/actions/python-poetry-env
4545
with:
4646
python-version: ${{ matrix.python-version }}
4747
- run: poetry run pytest
48+
49+
docs:
50+
runs-on: ubuntu-latest
51+
steps:
52+
- uses: actions/checkout@v4
53+
- uses: ./.github/actions/python-poetry-env
54+
- run: poetry run mkdocs build

.pre-commit-config.yaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,26 @@ repos:
1616
- id: mixed-line-ending
1717
- repo: local
1818
hooks:
19-
- id: black
20-
name: black
21-
entry: poetry run black
19+
- id: ruff-format
20+
name: ruff-format
21+
entry: poetry run ruff format
22+
require_serial: true
2223
language: system
23-
types: [python]
24+
types: [ python ]
25+
- id: ruff
26+
name: ruff
27+
# Add --fix, in case you want it to autofix when this hook runs
28+
entry: poetry run ruff check --force-exclude
29+
require_serial: true
30+
language: system
31+
types: [ python ]
2432
- id: mypy
2533
name: mypy
2634
entry: poetry run mypy .
2735
require_serial: true
2836
language: system
2937
types: [python]
3038
pass_filenames: false
31-
- id: ruff
32-
name: ruff
33-
entry: poetry run ruff check
34-
require_serial: true
35-
language: system
36-
types: [python]
3739
- id: kacl-verify
3840
name: kacl-verify
3941
entry: poetry run kacl-cli verify

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

66
## [Unreleased]
7+
### Changed
8+
- Cruft update to get up to date with the parent cookiecutter template
9+
10+
### Removed
11+
- Support for Python 3.7
712

813
## [0.8.2] - 2024-01-29
914
### Added

LICENCE renamed to LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2021 Jerry Pussinen
1+
Copyright (c) 2024 Jerry Pussinen
22

33
Permission is hereby granted, free of charge, to any person obtaining
44
a copy of this software and associated documentation files (the

0 commit comments

Comments
 (0)