Merge branch 'release/2.3.0.0'

chdemko · Jun 19, 2023 · c39f1e8 · c39f1e8
2 parents ec239a6 + 361a2aa
commit c39f1e8
Show file tree

Hide file tree

Showing 19 changed files with 2,713 additions and 911 deletions.
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
@@ -10,49 +10,141 @@ on:
     branches: [ develop ]
 
 jobs:
-  test:
+  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"]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Set up Poetry ${{ matrix.poetry-version }}
+      uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: ${{ matrix.poetry-version }}
+    - 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
+    - name: Test with tox
+      run: |
+        VERSION=`poetry version -s` poetry run tox -e py
 
+  poetry:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.11"]
+        poetry-version: ["1.2.2", "1.3.2", "1.4.2", "1.5.1"]
+        pandoc-version: ["3.1.3"]
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Set up Poetry ${{ matrix.poetry-version }}
+      uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: ${{ matrix.poetry-version }}
+    - 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
+    - name: Test with tox
+      run: |
+        VERSION=`poetry version -s` poetry run tox -e py
 
+  pandoc:
+    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"]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.python-version }}
+    - name: Set up Poetry ${{ matrix.poetry-version }}
+      uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: ${{ matrix.poetry-version }}
     - name: Install dependencies
       run: |
-        wget https://github.com/jgm/pandoc/releases/download/2.11.4/pandoc-2.11.4-1-amd64.deb
-        sudo dpkg -i pandoc-2.11.4-1-amd64.deb
-        python -m pip install --upgrade pip
-        pip install wheel setuptools
-        pip install .[docs,test]
+        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
     - name: Test with tox
       run: |
-        tox -e py
+        VERSION=`poetry version -s` poetry run tox -e py
 
-  cov:
+  style:
     runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+    - name: Set up Poetry
+      uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: '1.5.1'
+    - name: Install dependencies
+      run: |
+        poetry self update
+        poetry self add poeblix
+        poetry install
+        poetry run python download.py
+    - name: Test with tox
+      run: |
+        poetry run tox -e style
+        poetry run tox -e linter
 
+  cov:
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v4
       with:
-        python-version: '3.x'
+        python-version: '3.11'
+    - name: Set up Poetry
+      uses: abatilo/actions-poetry@v2
+      with:
+        poetry-version: '1.5.1'
     - name: Install dependencies
       run: |
-        wget https://github.com/jgm/pandoc/releases/download/2.11.4/pandoc-2.11.4-1-amd64.deb
-        sudo dpkg -i pandoc-2.11.4-1-amd64.deb
-        python -m pip install --upgrade pip
-        pip install wheel setuptools coveralls
-        pip install .[test]
+        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
+        poetry self add poeblix
+        poetry install
+        poetry run python download.py
     - name: Test
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       run: |
-        coverage run --source=pandoc_latex_tip setup.py test
-        coveralls
+        VERSION=`poetry version -s` poetry run tox -e coverage
+        poetry run pip install coveralls
+        poetry run coveralls
+
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -9,23 +9,28 @@ on:
 
 jobs:
   deploy:
-
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+    - name: Set up Poetry
+      uses: abatilo/actions-poetry@v2
       with:
-        python-version: '3.x'
+        poetry-version: '1.5.1'
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
-        pip install setuptools wheel twine
+        poetry self update
+        poetry self add poeblix
+        poetry install
+        poetry run python download.py
+        poetry run pip install twine
     - name: Build and publish
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist
-        twine upload dist/*
+        poetry blixbuild
+        poetry run twine upload dist/*
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,23 +1,27 @@
-# .readthedocs.yml
-# Read the Docs configuration file
+# Read the Docs configuration file for Sphinx projects
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
 # Required
 version: 2
 
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-  configuration: docs/conf.py
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
 
-# Build documentation with MkDocs
-#mkdocs:
-#  configuration: mkdocs.yml
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
 
 # Optionally build your docs in additional formats such as PDF and ePub
-formats: all
+formats:
+   - htmlzip
 
-# Optionally set the version of Python and requirements required to build your docs
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
 python:
-  version: 3.7
-  install:
-    - requirements: docs/requirements.txt
+   install:
+   - requirements: docs/requirements.txt
+
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2016-2021, Christophe Demko
+Copyright (c) 2016-2023, Christophe Demko
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without