diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml index dc03fd3..76249f1 100644 --- a/.github/workflows/docs_test_action.yml +++ b/.github/workflows/docs_test_action.yml @@ -16,10 +16,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 1ecb7b9..1f5be86 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -19,10 +19,10 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" @@ -32,7 +32,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "3.9" diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index b889816..2b5e4f8 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -24,10 +24,10 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" @@ -37,7 +37,7 @@ jobs: - name: Setup Python 🐍 if: steps.changes.outputs.code == 'true' - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "3.9" diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index c8d55e4..9426085 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -33,11 +33,11 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" @@ -48,7 +48,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index cb8ec3e..32242e6 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -34,11 +34,11 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" @@ -49,7 +49,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "${{ matrix.config.python-version }}" @@ -83,10 +83,10 @@ jobs: runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Setup Python 🐍 - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: 3.8 @@ -136,11 +136,11 @@ jobs: runs-on: "ubuntu-22.04" steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" if: startsWith(github.ref, 'refs/tags/') - name: Setup Python 🐍 - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" if: startsWith(github.ref, 'refs/tags/') with: python-version: 3.8 diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 7901196..a2c5a97 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -33,11 +33,11 @@ jobs: steps: - name: Checkout 🛎️ - uses: "actions/checkout@v4" + uses: "actions/checkout@v6" - name: Check for changed files if: startsWith(github.ref, 'refs/tags/') != true - uses: dorny/paths-filter@v2 + uses: dorny/paths-filter@v4 id: changes with: list-files: "json" @@ -48,7 +48,7 @@ jobs: - name: Setup Python 🐍 id: setup-python if: ${{ steps.changes.outputs.code == 'true' || steps.changes.outcome == 'skipped' }} - uses: "actions/setup-python@v5" + uses: "actions/setup-python@v6" with: python-version: "${{ matrix.config.python-version }}" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 12f5a19..a7302aa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,6 +5,7 @@ exclude: ^$ ci: autoupdate_schedule: quarterly + skip: [taplo-lint] repos: - repo: https://github.com/repo-helper/pyproject-parser @@ -21,7 +22,6 @@ repos: - id: check-case-conflict - id: check-executables-have-shebangs - id: check-json - - id: check-toml - id: check-yaml - id: check-merge-conflict - id: check-symlinks @@ -31,8 +31,14 @@ repos: - id: mixed-line-ending - id: end-of-file-fixer + - repo: https://github.com/domdfcoding/taplo-pre-commit + rev: v0.10.0 + hooks: + - id: taplo-lint + args: [] + - repo: https://github.com/domdfcoding/pre-commit-hooks - rev: v0.7.0 + rev: v0.8.1 hooks: - id: requirements-txt-sorter args: @@ -78,9 +84,11 @@ repos: - id: forbid-crlf - repo: https://github.com/python-formate/snippet-fmt - rev: v0.1.5 + rev: v0.3.1 hooks: - id: snippet-fmt + additional_dependencies: + - formate-trailing-commas>=0.1.1 - repo: https://github.com/python-formate/formate rev: v1.2.1 diff --git a/doc-source/conf.py b/doc-source/conf.py index c0a9a65..9c1377a 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -93,7 +93,7 @@ def setup(app): app.connect("config-inited", lambda app, config: better_header_layout(config)) app.connect("build-finished", copy_asset_files) - app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") + app.add_js_file("https://cdn.jsdelivr.net/npm/twemoji@14.0.2/dist/twemoji.min.js") app.add_js_file("twemoji.js") app.add_css_file("twemoji.css") app.add_transform(sphinxemoji.EmojiSubstitutions) diff --git a/justfile b/justfile index 9cd8b78..4307956 100644 --- a/justfile +++ b/justfile @@ -23,3 +23,8 @@ bare-ignore: lint: unused-imports incomplete-defs bare-ignore tox -n qa + +uncomm: + git status -uall --ignored + +# Custom commands can be added below this comment diff --git a/pyproject.toml b/pyproject.toml index ca9329e..6c1c70d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,6 +73,7 @@ extensions = [ "html_section", "sphinx_click", ] +sphinxemoji_source = "https://cdn.jsdelivr.net/npm/twemoji@14.0.2/dist/twemoji.min.js" gitstamp_fmt = "%d %b %Y" templates_path = [ "_templates",] html_static_path = [ "_static",] diff --git a/tox.ini b/tox.ini index 8f84e12..7e87424 100644 --- a/tox.ini +++ b/tox.ini @@ -4,6 +4,10 @@ # * envlists # * testenv # * testenv:.package +# * testenv:py315-dev +# * testenv:py315 +# * testenv:py314-dev +# * testenv:py314 # * testenv:py313-dev # * testenv:py313 # * testenv:py312-dev @@ -41,6 +45,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 SETUPTOOLS_USE_DISTUTILS=stdlib +download = True deps = -r{toxinidir}/tests/requirements.txt commands = python --version @@ -133,7 +138,7 @@ skip_install = True ignore_errors = True changedir = {toxinidir} deps = pyupgrade-directories -commands = pyup_dirs notebook2script tests --py36-plus --recursive +commands = pyup_dirs notebook2script tests --py37-plus --recursive [testenv:coverage] basepython = python3.9