Skip to content

Commit 8a5c037

Browse files
author
Alan Christie
committed
build: Attempt to fix current CI issues
1 parent b8d6b86 commit 8a5c037

File tree

8 files changed

+20
-21
lines changed

8 files changed

+20
-21
lines changed

.github/workflows/build.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ jobs:
3232
strategy:
3333
matrix:
3434
python-version:
35-
- '3.10'
36-
- '3.11'
3735
- '3.12'
3836
steps:
3937
- name: Checkout

.github/workflows/publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- name: Set up Python
3838
uses: actions/setup-python@v5
3939
with:
40-
python-version: '3.11'
40+
python-version: '3.12'
4141
- name: Install dependencies
4242
run: |
4343
python -m pip install --upgrade pip

.pre-commit-config.yaml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
minimum_pre_commit_version: 2.18.1
2+
minimum_pre_commit_version: 3.7.0
33

44
repos:
55

@@ -8,7 +8,7 @@ repos:
88

99
# Conventional Commit message checker (commitizen)
1010
- repo: https://github.com/commitizen-tools/commitizen
11-
rev: v2.23.0
11+
rev: v3.21.3
1212
hooks:
1313
- id: commitizen
1414
stages:
@@ -34,15 +34,15 @@ repos:
3434
- --markdown-linebreak-ext=md
3535
# Black (uncompromising) Python code formatter
3636
- repo: https://github.com/psf/black
37-
rev: 22.12.0
37+
rev: 24.3.0
3838
hooks:
3939
- id: black
4040
args:
4141
- --target-version
4242
- py311
4343
# MyPy
4444
- repo: https://github.com/pre-commit/mirrors-mypy
45-
rev: v0.942
45+
rev: v1.9.0
4646
hooks:
4747
- id: mypy
4848
files: ^decoder
@@ -51,24 +51,23 @@ repos:
5151
- --non-interactive
5252
# YAML Lint
5353
- repo: https://github.com/adrienverge/yamllint
54-
rev: v1.26.3
54+
rev: v1.35.1
5555
hooks:
5656
- id: yamllint
5757
# Pyroma
5858
- repo: https://github.com/regebro/pyroma
59-
rev: "4.0"
59+
rev: "4.2"
6060
hooks:
6161
- id: pyroma
62-
63-
# Local hooks (requires a suitable env)
64-
# -----
65-
# The following expect 'pip install -r requirements.txt'
66-
6762
# Pylint
68-
- repo: local
63+
- repo: https://github.com/pycqa/pylint
64+
rev: v3.1.0
6965
hooks:
7066
- id: pylint
7167
name: pylint
7268
entry: pylint
73-
language: system
69+
additional_dependencies:
70+
- jinja2==3.0.3
71+
- jsonschema >= 3.2.0, < 4.0
72+
- pyyaml >= 5.3.1, < 7.0
7473
files: ^decoder/.*\.py$

.pylintrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
[messages control]
2-
3-
disable = C0330

build-requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
black == 22.12.0
2-
pre-commit == 2.21.0
3-
pylint == 2.15.9
1+
black == 24.3.0
2+
pre-commit == 3.7.0
3+
pylint == 3.1.0
44
pytest == 7.2.0
55
pytest-cov == 4.0.0

decoder/decode_jinja2_3_0.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""A decoder for jinja2 3.0.x formatted strings.
22
"""
3+
34
from typing import Dict, Optional, Set, Tuple
45

56
import jinja2

decoder/decoder.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
when launching applications (and Jobs) where text requires decoding,
55
given a 'template' string and a 'dictionary' of parameters and values.
66
"""
7+
78
import enum
89
import os
910
import re

setup.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
long_description=long_description,
2828
keywords="jinja2 decoder",
2929
platforms=["any"],
30+
python_requires=">=3.10",
3031
# Our modules to package
3132
packages=["decoder"],
3233
include_package_data=True,
@@ -39,6 +40,7 @@
3940
"License :: OSI Approved :: MIT License",
4041
"Programming Language :: Python :: 3.10",
4142
"Programming Language :: Python :: 3.11",
43+
"Programming Language :: Python :: 3.12",
4244
"Topic :: Software Development :: Libraries :: Python Modules",
4345
"Operating System :: POSIX :: Linux",
4446
],

0 commit comments

Comments
 (0)