Skip to content

Commit 93f69f1

Browse files
committed
Merge branch 'release/1.0.1.3'
2 parents 10d352f + 362c783 commit 93f69f1

File tree

14 files changed

+1422
-677
lines changed

14 files changed

+1422
-677
lines changed

.github/workflows/python-package.yml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ name: Python package
55

66
on:
77
push:
8-
branches: [ develop ]
8+
branches: [develop]
99
pull_request:
10-
branches: [ develop ]
10+
branches: [develop]
1111

1212
jobs:
1313
python:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python-version: ["3.9", "3.10", "3.11"]
18-
poetry-version: ["1.5.1"]
19-
pandoc-version: ["3.1.3"]
17+
python-version: ['3.9', '3.10', '3.11', '3.12']
18+
poetry-version: [1.7.1]
19+
pandoc-version: [3.1.11.1]
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- name: Set up Python ${{ matrix.python-version }}
2323
uses: actions/setup-python@v4
2424
with:
@@ -40,9 +40,9 @@ jobs:
4040
runs-on: ubuntu-latest
4141
strategy:
4242
matrix:
43-
python-version: ["3.11"]
44-
poetry-version: ["1.2.2", "1.3.2", "1.4.2", "1.5.1"]
45-
pandoc-version: ["3.1.3"]
43+
python-version: ['3.12']
44+
poetry-version: [1.2.2, 1.3.2, 1.4.2, 1.5.1, 1.6.1, 1.7.1]
45+
pandoc-version: [3.1.11.1]
4646
steps:
4747
- uses: actions/checkout@v3
4848
- name: Set up Python ${{ matrix.python-version }}
@@ -66,11 +66,11 @@ jobs:
6666
runs-on: ubuntu-latest
6767
strategy:
6868
matrix:
69-
python-version: ["3.11"]
70-
poetry-version: ["1.5.1"]
71-
pandoc-version: ["2.11.4", "2.12", "2.13", "2.14.2", "2.15", "2.16.2", "2.17.1.1", "2.18", "2.19.2", "3.0.1", "3.1.3"]
69+
python-version: ['3.12']
70+
poetry-version: [1.7.1]
71+
pandoc-version: [2.11.4, '2.12', '2.13', 2.14.2, '2.15', 2.16.2, 2.17.1.1, '2.18', 2.19.2, 3.0.1, 3.1.11.1]
7272
steps:
73-
- uses: actions/checkout@v3
73+
- uses: actions/checkout@v4
7474
- name: Set up Python ${{ matrix.python-version }}
7575
uses: actions/setup-python@v4
7676
with:
@@ -91,15 +91,15 @@ jobs:
9191
style:
9292
runs-on: ubuntu-latest
9393
steps:
94-
- uses: actions/checkout@v3
94+
- uses: actions/checkout@v4
9595
- name: Set up Python
9696
uses: actions/setup-python@v4
9797
with:
98-
python-version: '3.11'
98+
python-version: '3.12'
9999
- name: Set up Poetry
100100
uses: abatilo/actions-poetry@v2
101101
with:
102-
poetry-version: '1.5.1'
102+
poetry-version: 1.7.1
103103
- name: Install dependencies
104104
run: |
105105
poetry install
@@ -111,19 +111,19 @@ jobs:
111111
cov:
112112
runs-on: ubuntu-latest
113113
steps:
114-
- uses: actions/checkout@v3
114+
- uses: actions/checkout@v4
115115
- name: Set up Python
116116
uses: actions/setup-python@v4
117117
with:
118-
python-version: '3.11'
118+
python-version: '3.12'
119119
- name: Set up Poetry
120120
uses: abatilo/actions-poetry@v2
121121
with:
122-
poetry-version: '1.5.1'
122+
poetry-version: 1.7.1
123123
- name: Install dependencies
124124
run: |
125-
wget https://github.com/jgm/pandoc/releases/download/3.1.3/pandoc-3.1.3-1-amd64.deb
126-
sudo dpkg -i ./pandoc-3.1.3-1-amd64.deb
125+
wget https://github.com/jgm/pandoc/releases/download/3.1.6/pandoc-3.1.11.1-1-amd64.deb
126+
sudo dpkg -i ./pandoc-3.1.11.1-1-amd64.deb
127127
poetry install
128128
- name: Test
129129
env:

.github/workflows/python-publish.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,20 @@ jobs:
1111
deploy:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
15+
with:
16+
fetch-depth: 0
1517
- name: Set up Python
1618
uses: actions/setup-python@v4
1719
with:
18-
python-version: '3.11'
20+
python-version: '3.12'
1921
- name: Set up Poetry
2022
uses: abatilo/actions-poetry@v2
2123
with:
22-
poetry-version: '1.5.1'
24+
poetry-version: 1.7.1
25+
- name: Set up poetry-dynamic-versioning
26+
run: |
27+
poetry self add "poetry-dynamic-versioning[plugin]"
2328
- name: Install dependencies
2429
run: |
2530
poetry install

.pre-commit-config.yaml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v4.4.0
4+
hooks:
5+
- id: check-toml
6+
- id: check-yaml
7+
8+
- repo: https://gitlab.com/smop/pre-commit-hooks
9+
rev: v1.0.0
10+
hooks:
11+
- id: check-poetry
12+
13+
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
14+
rev: v2.10.0
15+
hooks:
16+
- id: pretty-format-toml
17+
exclude: ^poetry.lock$
18+
args: [--autofix, --no-sort]
19+
- id: pretty-format-yaml
20+
args: [--autofix]
21+
22+
- repo: https://github.com/tox-dev/tox-ini-fmt
23+
rev: 1.3.1
24+
hooks:
25+
- id: tox-ini-fmt
26+
27+
- repo: https://github.com/ariebovenberg/slotscheck
28+
rev: v0.17.0
29+
hooks:
30+
- id: slotscheck
31+
language: system
32+
exclude: ^(?!pandoc_codeblock_include.py)
33+
34+
- repo: https://github.com/dosisod/refurb
35+
rev: v1.20.0
36+
hooks:
37+
- id: refurb
38+
39+
- repo: https://github.com/isidentical/teyit
40+
rev: 0.4.3
41+
hooks:
42+
- id: teyit
43+
44+
- repo: https://github.com/astral-sh/ruff-pre-commit
45+
rev: v0.0.287
46+
hooks:
47+
- id: ruff
48+
language: system
49+
exclude: ^(?!pandoc_codeblock_include.py)
50+
51+
- repo: https://github.com/psf/black
52+
rev: 23.7.0
53+
hooks:
54+
- id: black-jupyter
55+
args: [--config=pyproject.toml, pandoc_codeblock_include.py, tests]
56+
57+
- repo: https://github.com/PyCQA/doc8/
58+
rev: v1.1.1
59+
hooks:
60+
- id: doc8
61+
args: [docs]
62+
63+
- repo: https://github.com/pre-commit/mirrors-mypy
64+
rev: v1.5.1
65+
hooks:
66+
- id: mypy
67+
language: system
68+
exclude: ^(?!pandoc_codeblock_include.py)
69+
70+
- repo: https://github.com/pycqa/flake8
71+
rev: 6.1.0
72+
hooks:
73+
- id: flake8
74+
language: system
75+
exclude: ^(?!pandoc_codeblock_include.py)
76+
77+
- repo: https://github.com/pre-commit/mirrors-pylint
78+
rev: v3.0.0a5
79+
hooks:
80+
- id: pylint
81+
language: system
82+
exclude: ^(?!pandoc_codeblock_include.py)

.readthedocs.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,24 @@ version: 2
88
build:
99
os: ubuntu-22.04
1010
tools:
11-
python: "3.11"
11+
python: '3.11'
12+
jobs:
13+
post_create_environment:
14+
# Install poetry
15+
# https://python-poetry.org/docs/#installing-manually
16+
- pip install poetry
17+
- poetry self add "poetry-dynamic-versioning[plugin]"
18+
# Tell poetry to not use a virtual environment
19+
- poetry config virtualenvs.create false
20+
post_install:
21+
# Install dependencies with 'docs' dependency group
22+
# https://python-poetry.org/docs/managing-dependencies/#dependency-groups
23+
- poetry install --with docs
1224

1325
# Build documentation in the "docs/" directory with Sphinx
1426
sphinx:
15-
configuration: docs/conf.py
27+
configuration: docs/conf.py
1628

1729
# Optionally build your docs in additional formats such as PDF and ePub
1830
formats:
19-
- htmlzip
20-
21-
# Optional but recommended, declare the Python requirements required
22-
# to build your documentation
23-
# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
24-
python:
25-
install:
26-
- requirements: docs/requirements.txt
27-
31+
- htmlzip

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2018-2023, Christophe Demko
3+
Copyright (c) 2018-2024, Christophe Demko
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)