Skip to content

Commit

Permalink
Merge branch 'release/3.0.0.0a0'
Browse files Browse the repository at this point in the history
  • Loading branch information
chdemko committed Aug 9, 2024
2 parents 4143870 + c034427 commit e1036e2
Show file tree
Hide file tree
Showing 20 changed files with 3,379 additions and 2,630 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12']
poetry-version: [1.7.1]
pandoc-version: [3.1.11.1]
python-version: ['3.10', '3.11', '3.12']
poetry-version: [1.8.3]
pandoc-version: ['3.3']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -46,9 +46,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.11']
poetry-version: [1.5.1, 1.6.1, 1.7.1]
pandoc-version: [3.1.11.1]
python-version: ['3.12']
poetry-version: [1.5.1, 1.6.1, 1.7.1, 1.8.3]
pandoc-version: ['3.3']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -78,9 +78,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
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]
python-version: ['3.12']
poetry-version: [1.8.3]
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.13, 3.2.1, '3.3']
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -113,11 +113,11 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'
- name: Set up Poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: 1.7.1
poetry-version: 1.8.3
- name: Set up poetry-dynamic-versioning
run: |
poetry self add "poetry-dynamic-versioning[plugin]"
Expand All @@ -139,18 +139,18 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'
- name: Set up Poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: 1.7.1
poetry-version: 1.8.3
- 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.11.1/pandoc-3.1.11.1-1-amd64.deb
sudo dpkg -i ./pandoc-3.1.11.1-1-amd64.deb
wget https://github.com/jgm/pandoc/releases/download/3.3/pandoc-3.3-1-amd64.deb
sudo dpkg -i ./pandoc-3.3-1-amd64.deb
poetry self add poeblix
poetry install
poetry run python download.py
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,20 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'
- name: Set up Poetry
uses: abatilo/actions-poetry@v2
with:
poetry-version: 1.7.1
poetry-version: 1.8.3
- name: Set up poetry-dynamic-versioning
run: |
poetry self add "poetry-dynamic-versioning[plugin]"
poetry self add "poetry-dynamic-versioning[plugin]"
- name: Install dependencies
run: |
poetry self update
Expand Down
39 changes: 23 additions & 16 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.4.0
rev: v4.6.0
hooks:
- id: check-toml
- id: check-yaml
Expand All @@ -9,12 +9,12 @@ repos:
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
rev: v2.14.0
hooks:
- id: pretty-format-toml
exclude: ^poetry.lock$
args: [--autofix, --no-sort]
- id: pretty-format-yaml
args: [--autofix]
Expand All @@ -25,14 +25,14 @@ repos:
- id: tox-ini-fmt

- repo: https://github.com/ariebovenberg/slotscheck
rev: v0.17.0
rev: v0.19.0
hooks:
- id: slotscheck
language: system
exclude: ^(?!pandoc_latex_tip.py)
exclude: ^(?!(pandoc_latex_tip/|download.py))

- repo: https://github.com/dosisod/refurb
rev: v1.20.0
rev: v2.0.0
hooks:
- id: refurb

Expand All @@ -42,41 +42,48 @@ repos:
- id: teyit

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.0.287
rev: v0.5.7
hooks:
- id: ruff
language: system
exclude: ^(?!pandoc_latex_tip.py)
exclude: ^(?!(pandoc_latex_tip/|download.py))

- repo: https://github.com/psf/black
rev: 23.7.0
rev: 24.8.0
hooks:
- id: black-jupyter
args: [--config=pyproject.toml, pandoc_latex_tip.py, tests]
args: [--config=pyproject.toml, pandoc_latex_tip/, download.py, tests]

- repo: https://github.com/PyCQA/doc8/
rev: v1.1.1
hooks:
- id: doc8
args: [docs]
files: \.(rst|md)$

- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.5.1
rev: v1.11.1
hooks:
- id: mypy
language: system
exclude: ^(?!pandoc_latex_tip.py)
exclude: ^(?!(pandoc_latex_tip/|download.py))

- repo: https://github.com/pycqa/flake8
rev: 6.1.0
rev: 7.1.1
hooks:
- id: flake8
language: system
exclude: ^(?!pandoc_latex_tip.py)
exclude: ^(?!(pandoc_latex_tip/|download.py))

- repo: https://github.com/pre-commit/mirrors-pylint
rev: v3.0.0a5
hooks:
- id: pylint
language: system
exclude: ^(?!pandoc_latex_tip.py)
exclude: ^(?!(pandoc_latex_tip/|download.py))

- repo: https://github.com/asottile/pyupgrade
rev: v3.17.0
hooks:
- id: pyupgrade
language: system
args: [--py310-plus]
4 changes: 3 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ build:
post_install:
# Install dependencies with 'docs' dependency group
# https://python-poetry.org/docs/managing-dependencies/#dependency-groups
- poetry install --with docs
# VIRTUAL_ENV needs to be set manually for now.
# See https://github.com/readthedocs/readthedocs.org/pull/11152/
- VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install --with docs

# Build documentation in the "docs/" directory with Sphinx
sphinx:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2016-2023, Christophe Demko
Copyright (c) 2016-2024, Christophe Demko
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
Loading

0 comments on commit e1036e2

Please sign in to comment.