diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml index e8cded9b..67e2117a 100644 --- a/.github/workflows/cd_release.yml +++ b/.github/workflows/cd_release.yml @@ -24,7 +24,7 @@ jobs: fetch-depth: 0 - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9 @@ -107,7 +107,7 @@ jobs: ref: ${{ env.PUBLISH_UPDATE_BRANCH }} - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9 diff --git a/.github/workflows/ci_cd_updated_master.yml b/.github/workflows/ci_cd_updated_master.yml index a5dfccd0..595c2234 100644 --- a/.github/workflows/ci_cd_updated_master.yml +++ b/.github/workflows/ci_cd_updated_master.yml @@ -84,7 +84,7 @@ jobs: - name: Set up Python 3.9 if: env.RELEASE_RUN == 'false' - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9 diff --git a/.github/workflows/ci_dependabot.yml b/.github/workflows/ci_dependabot.yml index c06f6915..3fde708d 100644 --- a/.github/workflows/ci_dependabot.yml +++ b/.github/workflows/ci_dependabot.yml @@ -24,7 +24,7 @@ jobs: ref: master - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9 @@ -81,7 +81,7 @@ jobs: - name: Fetch PR body id: pr_body - uses: chuhlomin/render-template@v1.4 + uses: chuhlomin/render-template@v1.5 with: template: .github/utils/single_dependency_pr_body.txt diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 9c882403..9d828d75 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9 @@ -52,7 +52,7 @@ jobs: fetch-depth: 2 - name: Set up Python 3.9 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: 3.9 @@ -65,10 +65,10 @@ jobs: pip install safety - name: Run pylint - run: pylint --rcfile=.pylintrc --ignore-paths=tests/ --extension-pkg-whitelist='pydantic' -- *.py oteapi_dlite + run: pylint --rcfile=.pylintrc --ignore-paths=tests/ --extension-pkg-whitelist='pydantic' *.py oteapi_dlite - name: Run pylint - tests - run: pylint --rcfile=.pylintrc --extension-pkg-whitelist='pydantic' --disable=C0415,W0621 -- tests + run: pylint --rcfile=.pylintrc --extension-pkg-whitelist='pydantic' --disable=C0415,W0621 tests # Ignore ID 44715 for now. # See this NumPy issue for more information: https://github.com/numpy/numpy/issues/19038 @@ -90,7 +90,7 @@ jobs: fetch-depth: 2 - name: Set up Python ${{ matrix.python-version}} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version}} @@ -125,7 +125,7 @@ jobs: fetch-depth: 2 - name: Set up Python ${{ matrix.python-version}} - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version}} @@ -153,7 +153,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: 3.9 @@ -174,7 +174,7 @@ jobs: with: fetch-depth: 2 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v4 with: python-version: 3.9 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 73ef58ae..7503e41e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ # pre-commit autoupdate repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.2.0 + rev: v4.3.0 hooks: - id: end-of-file-fixer - id: debug-statements @@ -37,7 +37,7 @@ repos: files: ^oteapi_dlite/.*$ - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.950 + rev: v0.961 hooks: - id: mypy exclude: ^tests/.*$ diff --git a/mkdocs.yml b/mkdocs.yml index e9bd85d3..94a78177 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -54,7 +54,7 @@ plugins: default_handler: python handlers: python: - rendering: + options: show_root_heading: false show_root_toc_entry: true show_root_full_path: true @@ -65,7 +65,6 @@ plugins: show_bases: true group_by_category: true heading_level: 2 - selection: filters: - "!^_" - "^__init__$" @@ -74,14 +73,14 @@ plugins: - "!__config__$" - "!__str__$" - "!__repr__$" - members: true - inherited_members: false + members: null + # inherited_members: false docstring_style: google - docstring_options: - replace_admonitions: true - setup_commands: - - import os - - os.environ["MKDOCS_BUILD"] = "1" + # docstring_options: + # replace_admonitions: true + # setup_commands: + # - import os + # - os.environ["MKDOCS_BUILD"] = "1" watch: - oteapi_dlite - awesome-pages diff --git a/oteapi_dlite/strategies/filter.py b/oteapi_dlite/strategies/filter.py index b6b1faf2..d7b58232 100644 --- a/oteapi_dlite/strategies/filter.py +++ b/oteapi_dlite/strategies/filter.py @@ -1,5 +1,5 @@ """Trivial filter that adds an empty collection to the session.""" -# pylint: disable=no-self-use,unused-argument +# pylint: disable=unused-argument from typing import TYPE_CHECKING, Any, Dict import dlite diff --git a/oteapi_dlite/strategies/parse_excel.py b/oteapi_dlite/strategies/parse_excel.py index b9206cd7..4ffb565a 100644 --- a/oteapi_dlite/strategies/parse_excel.py +++ b/oteapi_dlite/strategies/parse_excel.py @@ -1,5 +1,5 @@ """Strategy for parsing an Excel spreadsheet to a DLite instance.""" -# pylint: disable=no-self-use,unused-argument +# pylint: disable=unused-argument import re from random import getrandbits from typing import TYPE_CHECKING, Optional diff --git a/oteapi_dlite/strategies/parse_image.py b/oteapi_dlite/strategies/parse_image.py index 4ae1b006..b04f3671 100644 --- a/oteapi_dlite/strategies/parse_image.py +++ b/oteapi_dlite/strategies/parse_image.py @@ -1,5 +1,4 @@ """Strategy class for parsing an image to a DLite instance.""" -# pylint: disable=no-self-use import logging from typing import TYPE_CHECKING diff --git a/oteapi_dlite/strategies/serialise.py b/oteapi_dlite/strategies/serialise.py index fc53fa19..460596f2 100644 --- a/oteapi_dlite/strategies/serialise.py +++ b/oteapi_dlite/strategies/serialise.py @@ -1,5 +1,4 @@ """Filter for serialisation using DLite.""" -# pylint: disable=no-self-use from pathlib import Path from typing import TYPE_CHECKING, Optional, Sequence diff --git a/requirements_dev.txt b/requirements_dev.txt index 7646cc5e..e2df6081 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,4 +1,4 @@ pre-commit~=2.19 -pylint~=2.13 +pylint~=2.14 pytest~=7.1 pytest-cov~=3.0 diff --git a/requirements_docs.txt b/requirements_docs.txt index ff0911cc..9e5dfdf1 100644 --- a/requirements_docs.txt +++ b/requirements_docs.txt @@ -2,5 +2,5 @@ invoke~=1.7 mike~=1.1 mkdocs~=1.3 mkdocs-awesome-pages-plugin~=2.7 -mkdocs-material~=8.2 -mkdocstrings[python]~=0.18.1 +mkdocs-material~=8.3 +mkdocstrings[python]~=0.19.0