Merge branch 'release/2.3.1.0'

chdemko · Jan 18, 2024 · 560da27 · 560da27
2 parents c39f1e8 + 2515925
commit 560da27
Show file tree

Hide file tree

Showing 14 changed files with 2,397 additions and 1,323 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -5,18 +5,18 @@ name: Python package
 
 on:
   push:
-    branches: [ develop ]
+    branches: [develop]
   pull_request:
-    branches: [ develop ]
+    branches: [develop]
 
 jobs:
   python:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-        poetry-version: ["1.5.1"]
-        pandoc-version: ["3.1.3"]
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        poetry-version: [1.7.1]
+        pandoc-version: [3.1.11.1]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -27,14 +27,17 @@ jobs:
       uses: abatilo/actions-poetry@v2
       with:
         poetry-version: ${{ matrix.poetry-version }}
+    - name: Set up poetry-dynamic-versioning
+      run: |
+        poetry self add "poetry-dynamic-versioning[plugin]"
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
         sudo dpkg -i ./pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
-        poetry self update
         poetry self add poeblix
         poetry install
         poetry run python download.py
+        poetry blixbuild
     - name: Test with tox
       run: |
         VERSION=`poetry version -s` poetry run tox -e py
@@ -43,9 +46,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11"]
-        poetry-version: ["1.2.2", "1.3.2", "1.4.2", "1.5.1"]
-        pandoc-version: ["3.1.3"]
+        python-version: ['3.11']
+        poetry-version: [1.5.1, 1.6.1, 1.7.1]
+        pandoc-version: [3.1.11.1]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -56,14 +59,17 @@ jobs:
       uses: abatilo/actions-poetry@v2
       with:
         poetry-version: ${{ matrix.poetry-version }}
+    - name: Set up poetry-dynamic-versioning
+      run: |
+        poetry self add "poetry-dynamic-versioning[plugin]"
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
         sudo dpkg -i ./pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
-        poetry self update
         poetry self add poeblix
         poetry install
         poetry run python download.py
+        poetry blixbuild
     - name: Test with tox
       run: |
         VERSION=`poetry version -s` poetry run tox -e py
@@ -72,9 +78,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.11"]
-        poetry-version: ["1.5.1"]
-        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"]
+        python-version: ['3.11']
+        poetry-version: [1.7.1]
+        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]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
@@ -85,14 +91,17 @@ jobs:
       uses: abatilo/actions-poetry@v2
       with:
         poetry-version: ${{ matrix.poetry-version }}
+    - name: Set up poetry-dynamic-versioning
+      run: |
+        poetry self add "poetry-dynamic-versioning[plugin]"
     - name: Install dependencies
       run: |
         wget https://github.com/jgm/pandoc/releases/download/${{ matrix.pandoc-version }}/pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
         sudo dpkg -i ./pandoc-${{ matrix.pandoc-version }}-1-amd64.deb
-        poetry self update
         poetry self add poeblix
         poetry install
         poetry run python download.py
+        poetry blixbuild
     - name: Test with tox
       run: |
         VERSION=`poetry version -s` poetry run tox -e py
@@ -108,13 +117,16 @@ jobs:
     - name: Set up Poetry
       uses: abatilo/actions-poetry@v2
       with:
-        poetry-version: '1.5.1'
+        poetry-version: 1.7.1
+    - name: Set up poetry-dynamic-versioning
+      run: |
+        poetry self add "poetry-dynamic-versioning[plugin]"
     - name: Install dependencies
       run: |
-        poetry self update
         poetry self add poeblix
         poetry install
         poetry run python download.py
+        poetry blixbuild
     - name: Test with tox
       run: |
         poetry run tox -e style
@@ -131,15 +143,18 @@ jobs:
     - name: Set up Poetry
       uses: abatilo/actions-poetry@v2
       with:
-        poetry-version: '1.5.1'
+        poetry-version: 1.7.1
+    - name: Set up poetry-dynamic-versioning
+      run: |
+        poetry self add "poetry-dynamic-versioning[plugin]"
     - name: Install dependencies
       run: |
-        wget https://github.com/jgm/pandoc/releases/download/3.1.3/pandoc-3.1.3-1-amd64.deb
-        sudo dpkg -i ./pandoc-3.1.3-1-amd64.deb
-        poetry self update
+        wget https://github.com/jgm/pandoc/releases/download/3.1.11.1/pandoc-3.1.11.1-1-amd64.deb
+        sudo dpkg -i ./pandoc-3.1.11.1-1-amd64.deb
         poetry self add poeblix
         poetry install
         poetry run python download.py
+        poetry blixbuild
     - name: Test
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -19,7 +19,10 @@ jobs:
     - name: Set up Poetry
       uses: abatilo/actions-poetry@v2
       with:
-        poetry-version: '1.5.1'
+        poetry-version: 1.7.1
+    - name: Set up poetry-dynamic-versioning
+      run: |
+        poetry self add "poetry-dynamic-versioning[plugin]"        
     - name: Install dependencies
       run: |
         poetry self update

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,82 @@
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.4.0
+  hooks:
+  - id: check-toml
+  - id: check-yaml
+
+- repo: https://gitlab.com/smop/pre-commit-hooks
+  rev: v1.0.0
+  hooks:
+  - id: check-poetry
+  - id: check-gitlab-ci
+
+- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
+  rev: v2.10.0
+  hooks:
+  - id: pretty-format-toml
+    args: [--autofix, --no-sort]
+  - id: pretty-format-yaml
+    args: [--autofix]
+
+- repo: https://github.com/tox-dev/tox-ini-fmt
+  rev: 1.3.1
+  hooks:
+  - id: tox-ini-fmt
+
+- repo: https://github.com/ariebovenberg/slotscheck
+  rev: v0.17.0
+  hooks:
+  - id: slotscheck
+    language: system
+    exclude: ^(?!pandoc_latex_tip.py)
+
+- repo: https://github.com/dosisod/refurb
+  rev: v1.20.0
+  hooks:
+  - id: refurb
+
+- repo: https://github.com/isidentical/teyit
+  rev: 0.4.3
+  hooks:
+  - id: teyit
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  rev: v0.0.287
+  hooks:
+  - id: ruff
+    language: system
+    exclude: ^(?!pandoc_latex_tip.py)
+
+- repo: https://github.com/psf/black
+  rev: 23.7.0
+  hooks:
+  - id: black-jupyter
+    args: [--config=pyproject.toml, pandoc_latex_tip.py, tests]
+
+- repo: https://github.com/PyCQA/doc8/
+  rev: v1.1.1
+  hooks:
+  - id: doc8
+    args: [docs]
+
+- repo: https://github.com/pre-commit/mirrors-mypy
+  rev: v1.5.1
+  hooks:
+  - id: mypy
+    language: system
+    exclude: ^(?!pandoc_latex_tip.py)
+
+- repo: https://github.com/pycqa/flake8
+  rev: 6.1.0
+  hooks:
+  - id: flake8
+    language: system
+    exclude: ^(?!pandoc_latex_tip.py)
+
+- repo: https://github.com/pre-commit/mirrors-pylint
+  rev: v3.0.0a5
+  hooks:
+  - id: pylint
+    language: system
+    exclude: ^(?!pandoc_latex_tip.py)
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -8,20 +8,24 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: '3.11'
+  jobs:
+    post_create_environment:
+    # Install poetry
+    # https://python-poetry.org/docs/#installing-manually
+    - pip install poetry
+    - poetry self add "poetry-dynamic-versioning[plugin]"
+    # Tell poetry to not use a virtual environment
+    - poetry config virtualenvs.create false
+    post_install:
+    # Install dependencies with 'docs' dependency group
+    # https://python-poetry.org/docs/managing-dependencies/#dependency-groups
+    - poetry install --with docs
 
 # Build documentation in the "docs/" directory with Sphinx
 sphinx:
-   configuration: docs/conf.py
+  configuration: docs/conf.py
 
 # Optionally build your docs in additional formats such as PDF and ePub
 formats:
-   - htmlzip
-
-# Optional but recommended, declare the Python requirements required
-# to build your documentation
-# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
-python:
-   install:
-   - requirements: docs/requirements.txt
-
+- htmlzip
diff --git a/MANIFEST.in b/MANIFEST.in