diff --git a/Makefile b/Makefile index e36783772..da764ed82 100644 --- a/Makefile +++ b/Makefile @@ -145,15 +145,6 @@ mypy_script: mypy_ci: $(MAKE) --keep-going mypy mypy_test mypy_benchmark mypy_script -.PHONY: pytest_and_coverage # Launch pytest and its coverage check -pytest_and_coverage: pytest coverage - -.PHONY: coverage # Check the coverage of code (within pytest) -coverage: - @if [[ "$$BB" == "" ]]; then BB=origin/main; fi && \ - poetry run diff-cover coverage.xml --fail-under 100 \ - --html-report coverage.html --compare-branch $$BB - .PHONY: docker_build # Build dev docker docker_build: docker build --pull -t $(DEV_DOCKER_IMG) -f $(DEV_DOCKERFILE) . @@ -212,9 +203,6 @@ open_docs: @# This is macOS only. On other systems, one would use `start` or `xdg-open` open docs/_build/html/index.html -.PHONY: build_and_open_docs # Build HTML docs and open it in a browser (macOS only) -build_and_open_docs: clean_docs docs open_docs - .PHONY: pydocstyle # Launch syntax checker on source code documentation pydocstyle: @# From http://www.pydocstyle.org/en/stable/error_codes.html diff --git a/licences/licences_linux_dev.txt b/licences/licences_linux_dev.txt index a06dfbd4e..81d2f0985 100644 --- a/licences/licences_linux_dev.txt +++ b/licences/licences_linux_dev.txt @@ -20,7 +20,6 @@ bleach 4.1.0 Apache Software License certifi 2021.10.8 Mozilla Public License 2.0 (MPL 2.0) cffi 1.15.0 MIT License - chardet 4.0.0 GNU Library or Lesser General Public License (LGPL) charset-normalizer 2.0.9 MIT License click 8.0.3 BSD License click-log 0.3.2 MIT License @@ -31,7 +30,6 @@ debugpy 1.5.1 Eclipse Public License 2.0 (EPL-2.0); MIT License decorator 5.1.0 BSD License defusedxml 0.7.1 Python Software Foundation License - diff-cover 6.4.4 Apache Software License; Other/Proprietary License docutils 0.17.1 BSD License; GNU General Public License (GPL); Public Domain; Python Software Foundation License dotty-dict 1.3.0 MIT License entrypoints 0.3 MIT License diff --git a/licences/licences_mac_dev.txt b/licences/licences_mac_dev.txt index 5e3765bcf..603ea3e75 100644 --- a/licences/licences_mac_dev.txt +++ b/licences/licences_mac_dev.txt @@ -1,69 +1,66 @@ Name Version License Babel 2.9.1 BSD License GitPython 3.1.24 BSD License - Jinja2 3.0.2 BSD License + Jinja2 3.0.3 BSD License MarkupSafe 2.0.1 BSD License Pillow 8.4.0 Historical Permission Notice and Disclaimer (HPND) PyYAML 6.0 MIT License Pygments 2.10.0 BSD License - QtPy 1.11.2 MIT License + QtPy 1.11.3 MIT License Send2Trash 1.8.0 BSD License - Sphinx 4.2.0 BSD License + Sphinx 4.3.0 BSD License alabaster 0.7.12 BSD License appnope 0.1.2 BSD License argon2-cffi 21.1.0 MIT License - astroid 2.8.3 GNU Lesser General Public License v2 (LGPLv2) + astroid 2.8.6 GNU Lesser General Public License v2 (LGPLv2) attrs 21.2.0 MIT License backcall 0.2.0 BSD License beautifulsoup4 4.10.0 MIT License - black 21.9b0 MIT License + black 21.12b0 MIT License bleach 4.1.0 Apache Software License certifi 2021.10.8 Mozilla Public License 2.0 (MPL 2.0) cffi 1.15.0 MIT License - chardet 4.0.0 GNU Library or Lesser General Public License (LGPL) - charset-normalizer 2.0.7 MIT License + charset-normalizer 2.0.9 MIT License click 8.0.3 BSD License click-log 0.3.2 MIT License colorama 0.4.4 BSD License coverage 6.2 Apache Software License - cycler 0.10.0 BSD + cycler 0.11.0 BSD License debugpy 1.5.1 Eclipse Public License 2.0 (EPL-2.0); MIT License decorator 5.1.0 BSD License defusedxml 0.7.1 Python Software Foundation License - diff-cover 6.4.2 Apache Software License; Other/Proprietary License docutils 0.17.1 BSD License; GNU General Public License (GPL); Public Domain; Python Software Foundation License dotty-dict 1.3.0 MIT License entrypoints 0.3 MIT License execnet 1.9.0 MIT License flake8 3.9.2 MIT License - flake8-bugbear 21.9.2 MIT License - gitdb 4.0.7 BSD License + flake8-bugbear 21.11.29 MIT License + fonttools 4.28.3 MIT License + gitdb 4.0.9 BSD License idna 3.3 BSD License - imagesize 1.2.0 MIT License - importlib-metadata 4.8.1 Apache Software License - inflect 5.3.0 MIT License + imagesize 1.3.0 MIT License + importlib-metadata 4.8.2 Apache Software License iniconfig 1.1.1 MIT License invoke 1.6.0 BSD License - ipykernel 6.4.1 BSD License - ipython 7.28.0 BSD License + ipykernel 6.6.0 BSD License + ipython 7.30.1 BSD License ipython-genutils 0.2.0 BSD License ipywidgets 7.6.5 BSD License - isort 5.9.3 MIT License - jedi 0.18.0 MIT License - jinja2-pluralize 0.3.0 BSD License - jsonschema 4.1.0 MIT License + isort 5.10.1 MIT License + jedi 0.18.1 MIT License + jsonschema 4.2.1 MIT License jupyter 1.0.0 BSD License - jupyter-client 7.0.6 BSD License + jupyter-client 7.1.0 BSD License jupyter-console 6.4.0 BSD License - jupyter-core 4.8.1 BSD License + jupyter-core 4.9.1 BSD License jupyterlab-pygments 0.1.2 BSD jupyterlab-widgets 1.0.2 BSD License - keyring 23.2.1 MIT License; Python Software Foundation License + keyring 23.4.0 MIT License; Python Software Foundation License kiwisolver 1.3.2 BSD License lazy-object-proxy 1.6.0 BSD License loguru 0.5.3 MIT License markdown-it-py 1.1.0 MIT License - matplotlib 3.4.3 Python Software Foundation License + matplotlib 3.5.0 Python Software Foundation License matplotlib-inline 0.1.3 BSD 3-Clause mccabe 0.6.1 MIT License mdit-py-plugins 0.2.8 MIT License @@ -71,65 +68,64 @@ mypy 0.910 MIT License mypy-extensions 0.4.3 MIT License myst-parser 0.15.2 MIT License - nbclient 0.5.4 BSD License - nbconvert 6.2.0 BSD License + nbclient 0.5.9 BSD License + nbconvert 6.3.0 BSD License nbformat 5.1.3 BSD License nbmake 0.9 Apache Software License nbsphinx 0.8.7 MIT License - nest-asyncio 1.5.1 BSD License + nest-asyncio 1.5.4 BSD License networkx 2.6.3 BSD License - notebook 6.4.4 BSD License - numpy 1.21.2 BSD License - packaging 21.0 Apache Software License; BSD License + notebook 6.4.6 BSD License + numpy 1.21.4 BSD License + packaging 21.3 Apache Software License; BSD License pandocfilters 1.5.0 BSD License - parso 0.8.2 MIT License + parso 0.8.3 MIT License pathspec 0.9.0 Mozilla Public License 2.0 (MPL 2.0) pexpect 4.8.0 ISC License (ISCL) pickleshare 0.7.5 MIT License - pkginfo 1.7.1 MIT License + pkginfo 1.8.2 MIT License platformdirs 2.4.0 MIT License pluggy 1.0.0 MIT License - prometheus-client 0.11.0 Apache Software License - prompt-toolkit 3.0.20 BSD License + prometheus-client 0.12.0 Apache Software License + prompt-toolkit 3.0.23 BSD License psutil 5.8.0 BSD License ptyprocess 0.7.0 ISC License (ISCL) - py 1.10.0 MIT License + py 1.11.0 MIT License py-cpuinfo 8.0.0 MIT License pycodestyle 2.7.0 MIT License - pycparser 2.20 BSD License + pycparser 2.21 BSD License pydantic 1.8.2 MIT License pydocstyle 6.1.1 MIT License pyflakes 2.3.1 MIT License pygments-style-tomorrow 1.0.0.1 UNKNOWN pygraphviz 1.7 BSD License pylint 2.11.1 GNU General Public License v2 (GPLv2) - pyparsing 2.4.7 MIT License + pyparsing 3.0.6 MIT License pyrsistent 0.18.0 MIT License pytest 6.2.5 MIT License pytest-cov 3.0.0 MIT License pytest-forked 1.3.0 MIT License - pytest-randomly 3.10.1 MIT License + pytest-randomly 3.10.3 MIT License pytest-xdist 2.4.0 MIT License python-dateutil 2.8.2 Apache Software License; BSD License - python-dotenv 0.19.1 BSD License + python-dotenv 0.19.2 BSD License python-gitlab 2.10.1 GNU Lesser General Public License v3 (LGPLv3) python-semantic-release 7.19.2 MIT pytz 2021.3 MIT License pyzmq 22.3.0 BSD License; GNU Library or Lesser General Public License (LGPL) - qtconsole 5.1.1 BSD License + qtconsole 5.2.1 BSD License readme-renderer 30.0 Apache Software License - regex 2021.10.8 Apache Software License requests 2.26.0 Apache Software License requests-toolbelt 0.9.1 Apache Software License rfc3986 1.5.0 Apache Software License semver 2.13.0 BSD License setuptools-scm 6.3.2 MIT License six 1.16.0 MIT License - smmap 4.0.0 BSD License - snowballstemmer 2.1.0 BSD License - soupsieve 2.2.1 MIT License + smmap 5.0.0 BSD License + snowballstemmer 2.2.0 BSD License + soupsieve 2.3.1 MIT License sphinx-copybutton 0.4.0 MIT License - sphinx-rtd-theme 1.0.0 MIT License + sphinx-zama-theme 2.0.5 BSD License sphinxcontrib-applehelp 1.0.2 BSD License sphinxcontrib-devhelp 1.0.2 BSD License sphinxcontrib-htmlhelp 2.0.0 BSD License @@ -139,18 +135,18 @@ terminado 0.12.1 BSD License testpath 0.5.0 BSD License toml 0.10.2 MIT License - tomli 1.2.1 MIT License + tomli 1.2.2 MIT License tomlkit 0.7.0 MIT License torch 1.10.0 BSD License torchvision 0.11.1 BSD tornado 6.1 Apache Software License tqdm 4.62.3 MIT License; Mozilla Public License 2.0 (MPL 2.0) - traitlets 5.1.0 BSD License - twine 3.4.2 Apache Software License - typing-extensions 3.10.0.2 Python Software Foundation License + traitlets 5.1.1 BSD License + twine 3.7.1 Apache Software License + typing-extensions 4.0.1 Python Software Foundation License urllib3 1.26.7 MIT License wcwidth 0.2.5 MIT License webencodings 0.5.1 BSD License - widgetsnbextension 3.5.1 BSD License - wrapt 1.13.2 BSD License + widgetsnbextension 3.5.2 BSD License + wrapt 1.13.3 BSD License zipp 3.6.0 MIT License diff --git a/licences/licences_mac_user.txt b/licences/licences_mac_user.txt index 179aed1fb..9f84e6208 100644 --- a/licences/licences_mac_user.txt +++ b/licences/licences_mac_user.txt @@ -1,12 +1,16 @@ Name Version License Pillow 8.4.0 Historical Permission Notice and Disclaimer (HPND) - cycler 0.10.0 BSD + cycler 0.11.0 BSD License + fonttools 4.28.3 MIT License kiwisolver 1.3.2 BSD License loguru 0.5.3 MIT License - matplotlib 3.4.3 Python Software Foundation License + matplotlib 3.5.0 Python Software Foundation License networkx 2.6.3 BSD License - numpy 1.21.2 BSD License + numpy 1.21.4 BSD License + packaging 21.3 Apache Software License; BSD License pygraphviz 1.7 BSD License - pyparsing 2.4.7 MIT License + pyparsing 3.0.6 MIT License python-dateutil 2.8.2 Apache Software License; BSD License + setuptools-scm 6.3.2 MIT License six 1.16.0 MIT License + tomli 1.2.2 MIT License diff --git a/poetry.lock b/poetry.lock index 38af020a5..887023210 100644 --- a/poetry.lock +++ b/poetry.lock @@ -154,14 +154,6 @@ python-versions = "*" [package.dependencies] pycparser = "*" -[[package]] -name = "chardet" -version = "4.0.0" -description = "Universal encoding detector for Python 2 and 3" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - [[package]] name = "charset-normalizer" version = "2.0.9" @@ -268,23 +260,6 @@ category = "dev" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -[[package]] -name = "diff-cover" -version = "6.4.4" -description = "Run coverage and linting reports on diffs" -category = "dev" -optional = false -python-versions = ">=3.6.2,<4.0.0" - -[package.dependencies] -chardet = ">=3.0.0" -Jinja2 = ">=2.7.1" -pluggy = ">=0.13.1,<2" -Pygments = ">=2.9.0,<3.0.0" - -[package.extras] -toml = ["tomli (>=1.2.1,<2.0.0)"] - [[package]] name = "docutils" version = "0.17.1" @@ -2016,7 +1991,7 @@ testing = ["pytest (>=4.6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytes [metadata] lock-version = "1.1" python-versions = ">=3.8,<3.9" -content-hash = "257bd43feacf444f205828ac6a97ad54ee24f00a94fd29e1800a1e3e42fa39f6" +content-hash = "7a5f77463c1ba2a46b1b210b4ad1561dea17a462d042b4ba3730d941c9da9fb2" [metadata.files] alabaster = [ @@ -2128,10 +2103,6 @@ cffi = [ {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, ] -chardet = [ - {file = "chardet-4.0.0-py2.py3-none-any.whl", hash = "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5"}, - {file = "chardet-4.0.0.tar.gz", hash = "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa"}, -] charset-normalizer = [ {file = "charset-normalizer-2.0.9.tar.gz", hash = "sha256:b0b883e8e874edfdece9c28f314e3dd5badf067342e42fb162203335ae61aa2c"}, {file = "charset_normalizer-2.0.9-py3-none-any.whl", hash = "sha256:1eecaa09422db5be9e29d7fc65664e6c33bd06f9ced7838578ba40d58bdf3721"}, @@ -2255,10 +2226,6 @@ defusedxml = [ {file = "defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"}, {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"}, ] -diff-cover = [ - {file = "diff_cover-6.4.4-py3-none-any.whl", hash = "sha256:d89c165d3c852c3c10e9f969236e08d413225ce52be8e2477be2a070987229bf"}, - {file = "diff_cover-6.4.4.tar.gz", hash = "sha256:b1d782c1ce53ad4b2c5545f8b7aa799eb61a0b12a62b376a18e2313c6f2d77f1"}, -] docutils = [ {file = "docutils-0.17.1-py2.py3-none-any.whl", hash = "sha256:cf316c8370a737a022b72b56874f6602acf974a37a9fba42ec2876387549fc61"}, {file = "docutils-0.17.1.tar.gz", hash = "sha256:686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125"}, diff --git a/pyproject.toml b/pyproject.toml index a964d0d1e..06e787c79 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,6 @@ black = "^21.9b0" pylint = "2.11.1" pytest = "^6.2.5" pytest-cov = "^3.0.0" -diff-cover = "^6.4.1" mypy = "0.910" pydocstyle = "^6.1.1" jupyter = "^1.0.0"