From 1d4433045059638a67ab212ea254d027a4b22060 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 16:54:01 +0100 Subject: [PATCH 01/23] DX: implement GitHub Actions caching --- .github/workflows/benchmark.yml | 6 +++++- .github/workflows/cd.yml | 4 ++++ .github/workflows/ci-docs.yml | 4 ++++ .github/workflows/ci-style.yml | 6 +++++- .github/workflows/ci-tests.yml | 16 ++++++++++++++++ .github/workflows/linkcheck.yml | 4 ++++ .pre-commit-config.yaml | 8 ++++---- 7 files changed, 42 insertions(+), 6 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 75443782..3bb8a605 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -17,7 +17,11 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: 3.9 + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg + python-version: "3.9" - name: Install dependencies run: | pip install -c .constraints/py3.9.txt -e .[test,all] diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 512f76ff..29916734 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -39,6 +39,10 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg python-version: "3.8" - name: Install dependencies run: | diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index c44cce26..a5738a3e 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -21,6 +21,10 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg python-version: "3.8" - name: Install dependencies run: | diff --git a/.github/workflows/ci-style.yml b/.github/workflows/ci-style.yml index 23c01a75..95ee540a 100644 --- a/.github/workflows/ci-style.yml +++ b/.github/workflows/ci-style.yml @@ -22,7 +22,11 @@ jobs: - name: Set up Python 3.8 uses: actions/setup-python@v4 with: - python-version: 3.8 + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg + python-version: "3.8" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index d73b6c8c..084dabbd 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -39,6 +39,10 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg python-version: ${{ matrix.python-version }} - name: Install dependencies run: | @@ -92,6 +96,10 @@ jobs: - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg python-version: ${{ matrix.python-version }} - name: Install dependencies run: | @@ -126,6 +134,10 @@ jobs: - name: Set up Python 3.9 uses: actions/setup-python@v4 with: + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg python-version: "3.9" - name: Install dependencies run: | @@ -154,6 +166,10 @@ jobs: - name: Set up Python 3.8 uses: actions/setup-python@v4 with: + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg python-version: "3.8" - name: Install dependencies run: | diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index 91673c89..b583ffaa 100644 --- a/.github/workflows/linkcheck.yml +++ b/.github/workflows/linkcheck.yml @@ -21,6 +21,10 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: + cache: pip + cache-dependency-path: | + .constraints/py3.*.txt + setup.cfg python-version: "3.8" - name: Install dependencies run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index fb39c574..77dfec98 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.149 + rev: 0.0.150 hooks: - id: check-dev-files args: @@ -68,7 +68,7 @@ repos: - id: blacken-docs - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v6.13.0 + rev: v6.14.1 hooks: - id: cspell @@ -180,12 +180,12 @@ repos: - python - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.277 + rev: v1.1.280 hooks: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.2.0 + rev: v3.2.2 hooks: - id: pyupgrade args: From e2dab720bc16e74ab7f7ec7a398296f22ed34c97 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 19 Nov 2022 16:07:02 +0000 Subject: [PATCH 02/23] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 95 ++++++++++++++++++++--------------------- .constraints/py3.7.txt | 82 +++++++++++++++++------------------ .constraints/py3.8.txt | 94 ++++++++++++++++++++-------------------- .constraints/py3.9.txt | 95 ++++++++++++++++++++--------------------- 4 files changed, 178 insertions(+), 188 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index e1c34eba..50869a2a 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -11,7 +11,7 @@ anyio==3.6.2 aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 -astroid==2.12.12 +astroid==2.12.13 asttokens==2.1.0 astunparse==1.6.3 attrs==22.1.0 @@ -39,8 +39,7 @@ distlib==0.3.6 dm-tree==0.1.7 docutils==0.17.1 entrypoints==0.4 -etils==0.9.0 -exceptiongroup==1.0.0 +exceptiongroup==1.0.4 execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 @@ -53,54 +52,52 @@ flake8-comprehensions==3.10.1 flake8-future-annotations==1.0.0 flake8-plugin-utils==1.3.2 flake8-pytest-style==1.6.0 -flake8-rst-docstrings==0.2.7 +flake8-rst-docstrings==0.3.0 flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" flake8-use-fstring==1.4 flatbuffers==22.10.26 fonttools==4.38.0 gast==0.4.0 -google-auth==2.14.0 +google-auth==2.14.1 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.0 +greenlet==2.0.1 grpcio==1.50.0 h5py==3.7.0 hepunits==2.3.0 -identify==2.5.8 +identify==2.5.9 idna==3.4 imagesize==1.4.1 iminuit==2.17.0 importlib-metadata==5.0.0 -importlib-resources==5.10.0 iniconfig==1.1.1 -ipykernel==6.17.0 +ipykernel==6.17.1 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 ipywidgets==8.0.2 isort==5.10.1 -jax==0.3.23 -jaxlib==0.3.22 +jax==0.3.25 +jaxlib==0.3.25 jedi==0.18.1 jinja2==3.1.2 json5==0.9.10 -jsonschema==4.16.0 +jsonschema==4.17.0 jupyter==1.0.0 jupyter-cache==0.5.0 -jupyter-client==7.4.4 +jupyter-client==7.4.7 jupyter-console==6.4.4 -jupyter-core==4.11.2 -jupyter-server==1.21.0 +jupyter-core==5.0.0 +jupyter-server==1.23.2 jupyterlab==3.5.0 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 jupyterlab-myst==0.1.6 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.16.2 +jupyterlab-server==2.16.3 jupyterlab-widgets==3.0.3 -keras==2.10.0 -keras-preprocessing==1.1.2 +keras==2.11.0 kiwisolver==1.4.4 lazy-object-proxy==1.8.0 libclang==14.0.6 @@ -109,27 +106,27 @@ llvmlite==0.39.1 markdown==3.4.1 markdown-it-py==2.1.0 markupsafe==2.1.1 -matplotlib==3.6.1 +matplotlib==3.6.2 matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.1 mdurl==0.1.2 mistune==2.0.4 mpmath==1.2.1 -mypy==0.982 +mypy==0.991 mypy-extensions==0.4.3 myst-nb==0.17.1 myst-parser==0.18.1 -nbclassic==0.4.7 +nbclassic==0.4.8 nbclient==0.5.13 -nbconvert==7.2.3 +nbconvert==7.2.5 nbformat==5.7.0 nbmake==1.3.0 nest-asyncio==1.5.6 nodeenv==1.7.0 notebook==6.5.2 -notebook-shim==0.2.0 -numba==0.56.3 +notebook-shim==0.2.2 +numba==0.56.4 numpy==1.23.4 oauthlib==3.2.2 opt-einsum==3.3.0 @@ -137,20 +134,20 @@ packaging==21.3 pandas==1.5.1 pandocfilters==1.5.0 parso==0.8.3 -particle==0.20.1 -pathspec==0.10.1 +particle==0.21.0 +pathspec==0.10.2 pep8-naming==0.13.2 pexpect==4.8.0 phasespace==1.7.0 pickleshare==0.7.5 pillow==9.3.0 -platformdirs==2.5.2 +platformdirs==2.5.4 pluggy==1.0.0 pre-commit==2.20.0 prometheus-client==0.15.0 -prompt-toolkit==3.0.31 +prompt-toolkit==3.0.32 protobuf==3.19.6 -psutil==5.9.3 +psutil==5.9.4 ptyprocess==0.7.0 pure-eval==0.2.2 py==1.11.0 @@ -164,9 +161,9 @@ pydata-sphinx-theme==0.8.1 pydocstyle==6.1.1 pyflakes==2.5.0 pygments==2.13.0 -pylint==2.15.5 +pylint==2.15.6 pyparsing==3.0.9 -pyrsistent==0.19.1 +pyrsistent==0.19.2 pytest==7.2.0 pytest-benchmark==4.0.0 pytest-cov==4.0.0 @@ -178,8 +175,8 @@ pytz==2022.6 pyyaml==6.0 pyzmq==24.0.1 qrules==0.9.7 -qtconsole==5.3.2 -qtpy==2.2.1 +qtconsole==5.4.0 +qtpy==2.3.0 requests==2.28.1 requests-oauthlib==1.3.1 restructuredtext-lint==1.4.0 @@ -193,9 +190,9 @@ soupsieve==2.3.2.post1 sphinx==4.5.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==0.3.3 -sphinx-codeautolink==0.12.0 +sphinx-codeautolink==0.12.1 sphinx-comments==0.0.3 -sphinx-copybutton==0.5.0 +sphinx-copybutton==0.5.1 sphinx-design==0.3.0 sphinx-thebe==0.1.2 sphinx-togglebutton==0.3.2 @@ -205,16 +202,16 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sphobjinv==2.2.2 -sqlalchemy==1.4.42 -stack-data==0.6.0 +sphobjinv==2.3 +sqlalchemy==1.4.44 +stack-data==0.6.1 sympy==1.11.1 tabulate==0.9.0 -tensorboard==2.10.1 +tensorboard==2.11.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1 -tensorflow==2.10.0 -tensorflow-estimator==2.10.0 +tensorflow==2.11.0 +tensorflow-estimator==2.11.0 tensorflow-io-gcs-filesystem==0.27.0 tensorflow-probability==0.17.0 termcolor==2.1.0 @@ -224,23 +221,23 @@ toml==0.10.2 tomli==2.0.1 tomlkit==0.11.6 tornado==6.2 -tox==3.27.0 +tox==3.27.1 tqdm==4.64.1 traitlets==5.5.0 types-docutils==0.19.1.1 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.1 -types-requests==2.28.11.2 -types-setuptools==65.5.0.2 -types-urllib3==1.26.25.1 +types-pyyaml==6.0.12.2 +types-requests==2.28.11.5 +types-setuptools==65.5.0.3 +types-urllib3==1.26.25.4 typing-extensions==4.4.0 urllib3==1.26.12 -virtualenv==20.16.6 +virtualenv==20.16.7 wcwidth==0.2.5 webencodings==0.5.1 -websocket-client==1.4.1 +websocket-client==1.4.2 werkzeug==2.2.2 -wheel==0.37.1 +wheel==0.38.4 widgetsnbextension==4.0.3 wrapt==1.14.1 zipp==3.10.0 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 7a0b3c93..797eebf3 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -11,7 +11,7 @@ anyio==3.6.2 aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 -astroid==2.12.12 +astroid==2.12.13 astunparse==1.6.3 attrs==22.1.0 babel==2.11.0 @@ -37,8 +37,7 @@ distlib==0.3.6 dm-tree==0.1.7 docutils==0.17.1 entrypoints==0.4 -etils==0.9.0 -exceptiongroup==1.0.0 +exceptiongroup==1.0.4 execnet==1.9.0 fastjsonschema==2.16.2 filelock==3.8.0 @@ -50,20 +49,20 @@ flake8-comprehensions==3.10.1 flake8-future-annotations==1.0.0 flake8-plugin-utils==1.3.2 flake8-pytest-style==1.6.0 -flake8-rst-docstrings==0.2.7 +flake8-rst-docstrings==0.3.0 flake8-use-fstring==1.4 flatbuffers==22.10.26 fonttools==4.38.0 gast==0.4.0 -google-auth==2.14.0 +google-auth==2.14.1 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.0 +greenlet==2.0.1 grpcio==1.50.0 h5py==3.7.0 hepunits==2.3.0 -identify==2.5.8 +identify==2.5.9 idna==3.4 imagesize==1.4.1 iminuit==2.17.0 @@ -76,18 +75,18 @@ ipython==7.34.0 ipython-genutils==0.2.0 ipywidgets==8.0.2 isort==5.10.1 -jax==0.3.23 -jaxlib==0.3.22 +jax==0.3.25 +jaxlib==0.3.25 jedi==0.18.1 jinja2==3.1.2 json5==0.9.10 -jsonschema==4.16.0 +jsonschema==4.17.0 jupyter==1.0.0 jupyter-cache==0.5.0 -jupyter-client==7.4.4 +jupyter-client==7.4.7 jupyter-console==6.4.4 jupyter-core==4.11.2 -jupyter-server==1.21.0 +jupyter-server==1.23.2 jupyterlab==3.5.0 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 @@ -95,8 +94,7 @@ jupyterlab-myst==0.1.6 jupyterlab-pygments==0.2.2 jupyterlab-server==2.15.2 ; python_version < "3.8.0" jupyterlab-widgets==3.0.3 -keras==2.10.0 -keras-preprocessing==1.1.2 +keras==2.11.0 kiwisolver==1.4.4 lazy-object-proxy==1.8.0 libclang==14.0.6 @@ -112,20 +110,20 @@ mdit-py-plugins==0.3.1 mdurl==0.1.2 mistune==2.0.4 mpmath==1.2.1 -mypy==0.982 +mypy==0.991 mypy-extensions==0.4.3 myst-nb==0.17.1 myst-parser==0.18.1 -nbclassic==0.4.7 +nbclassic==0.4.8 nbclient==0.5.13 -nbconvert==7.2.3 +nbconvert==7.2.5 nbformat==5.7.0 nbmake==1.3.0 nest-asyncio==1.5.6 nodeenv==1.7.0 notebook==6.5.2 -notebook-shim==0.2.0 -numba==0.56.3 +notebook-shim==0.2.2 +numba==0.56.4 numpy==1.21.6 oauthlib==3.2.2 opt-einsum==3.3.0 @@ -133,21 +131,21 @@ packaging==21.3 pandas==1.3.5 pandocfilters==1.5.0 parso==0.8.3 -particle==0.20.1 -pathspec==0.10.1 +particle==0.21.0 +pathspec==0.10.2 pep8-naming==0.13.2 pexpect==4.8.0 phasespace==1.7.0 pickleshare==0.7.5 pillow==9.3.0 pkgutil-resolve-name==1.3.10 -platformdirs==2.5.2 +platformdirs==2.5.4 pluggy==1.0.0 pre-commit==2.20.0 prometheus-client==0.15.0 -prompt-toolkit==3.0.31 +prompt-toolkit==3.0.32 protobuf==3.19.6 -psutil==5.9.3 +psutil==5.9.4 ptyprocess==0.7.0 py==1.11.0 py-cpuinfo==9.0.0 @@ -160,9 +158,9 @@ pydata-sphinx-theme==0.8.1 pydocstyle==6.1.1 pyflakes==2.5.0 pygments==2.13.0 -pylint==2.15.5 +pylint==2.15.6 pyparsing==3.0.9 -pyrsistent==0.19.1 +pyrsistent==0.19.2 pytest==7.2.0 pytest-benchmark==4.0.0 pytest-cov==4.0.0 @@ -174,8 +172,8 @@ pytz==2022.6 pyyaml==6.0 pyzmq==24.0.1 qrules==0.9.7 -qtconsole==5.3.2 -qtpy==2.2.1 +qtconsole==5.4.0 +qtpy==2.3.0 requests==2.28.1 requests-oauthlib==1.3.1 restructuredtext-lint==1.4.0 @@ -190,9 +188,9 @@ soupsieve==2.3.2.post1 sphinx==4.3.2 ; python_version < "3.8.0" sphinx-autobuild==2021.3.14 sphinx-book-theme==0.3.3 -sphinx-codeautolink==0.12.0 +sphinx-codeautolink==0.12.1 sphinx-comments==0.0.3 -sphinx-copybutton==0.5.0 +sphinx-copybutton==0.5.1 sphinx-design==0.3.0 sphinx-thebe==0.1.2 sphinx-togglebutton==0.3.2 @@ -202,15 +200,15 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sphobjinv==2.2.2 -sqlalchemy==1.4.42 +sphobjinv==2.3 +sqlalchemy==1.4.44 sympy==1.10.1 tabulate==0.9.0 -tensorboard==2.10.1 +tensorboard==2.11.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1 -tensorflow==2.10.0 -tensorflow-estimator==2.10.0 +tensorflow==2.11.0 +tensorflow-estimator==2.11.0 tensorflow-io-gcs-filesystem==0.27.0 tensorflow-probability==0.17.0 termcolor==2.1.0 @@ -220,24 +218,24 @@ toml==0.10.2 tomli==2.0.1 tomlkit==0.11.6 tornado==6.2 -tox==3.27.0 +tox==3.27.1 tqdm==4.64.1 traitlets==5.5.0 typed-ast==1.5.4 types-docutils==0.19.1.1 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.1 -types-requests==2.28.11.2 -types-setuptools==65.5.0.2 -types-urllib3==1.26.25.1 +types-pyyaml==6.0.12.2 +types-requests==2.28.11.5 +types-setuptools==65.5.0.3 +types-urllib3==1.26.25.4 typing-extensions==4.4.0 urllib3==1.26.12 virtualenv==20.15.1 ; python_version < "3.8.0" wcwidth==0.2.5 webencodings==0.5.1 -websocket-client==1.4.1 +websocket-client==1.4.2 werkzeug==2.2.2 -wheel==0.37.1 +wheel==0.38.4 widgetsnbextension==4.0.3 wrapt==1.14.1 zipp==3.10.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 5710c0c6..bdbbbd33 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -11,7 +11,7 @@ anyio==3.6.2 aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 -astroid==2.12.12 +astroid==2.12.13 asttokens==2.1.0 astunparse==1.6.3 attrs==22.1.0 @@ -39,8 +39,7 @@ distlib==0.3.6 dm-tree==0.1.7 docutils==0.17.1 entrypoints==0.4 -etils==0.9.0 -exceptiongroup==1.0.0 +exceptiongroup==1.0.4 execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 @@ -53,54 +52,53 @@ flake8-comprehensions==3.10.1 flake8-future-annotations==1.0.0 flake8-plugin-utils==1.3.2 flake8-pytest-style==1.6.0 -flake8-rst-docstrings==0.2.7 +flake8-rst-docstrings==0.3.0 flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" flake8-use-fstring==1.4 flatbuffers==22.10.26 fonttools==4.38.0 gast==0.4.0 -google-auth==2.14.0 +google-auth==2.14.1 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.0 +greenlet==2.0.1 grpcio==1.50.0 h5py==3.7.0 hepunits==2.3.0 -identify==2.5.8 +identify==2.5.9 idna==3.4 imagesize==1.4.1 iminuit==2.17.0 importlib-metadata==5.0.0 importlib-resources==5.10.0 iniconfig==1.1.1 -ipykernel==6.17.0 +ipykernel==6.17.1 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 ipywidgets==8.0.2 isort==5.10.1 -jax==0.3.23 -jaxlib==0.3.22 +jax==0.3.25 +jaxlib==0.3.25 jedi==0.18.1 jinja2==3.1.2 json5==0.9.10 -jsonschema==4.16.0 +jsonschema==4.17.0 jupyter==1.0.0 jupyter-cache==0.5.0 -jupyter-client==7.4.4 +jupyter-client==7.4.7 jupyter-console==6.4.4 -jupyter-core==4.11.2 -jupyter-server==1.21.0 +jupyter-core==5.0.0 +jupyter-server==1.23.2 jupyterlab==3.5.0 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 jupyterlab-myst==0.1.6 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.16.2 +jupyterlab-server==2.16.3 jupyterlab-widgets==3.0.3 -keras==2.10.0 -keras-preprocessing==1.1.2 +keras==2.11.0 kiwisolver==1.4.4 lazy-object-proxy==1.8.0 libclang==14.0.6 @@ -109,27 +107,27 @@ llvmlite==0.39.1 markdown==3.4.1 markdown-it-py==2.1.0 markupsafe==2.1.1 -matplotlib==3.6.1 +matplotlib==3.6.2 matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.1 mdurl==0.1.2 mistune==2.0.4 mpmath==1.2.1 -mypy==0.982 +mypy==0.991 mypy-extensions==0.4.3 myst-nb==0.17.1 myst-parser==0.18.1 -nbclassic==0.4.7 +nbclassic==0.4.8 nbclient==0.5.13 -nbconvert==7.2.3 +nbconvert==7.2.5 nbformat==5.7.0 nbmake==1.3.0 nest-asyncio==1.5.6 nodeenv==1.7.0 notebook==6.5.2 -notebook-shim==0.2.0 -numba==0.56.3 +notebook-shim==0.2.2 +numba==0.56.4 numpy==1.23.4 oauthlib==3.2.2 opt-einsum==3.3.0 @@ -137,21 +135,21 @@ packaging==21.3 pandas==1.5.1 pandocfilters==1.5.0 parso==0.8.3 -particle==0.20.1 -pathspec==0.10.1 +particle==0.21.0 +pathspec==0.10.2 pep8-naming==0.13.2 pexpect==4.8.0 phasespace==1.7.0 pickleshare==0.7.5 pillow==9.3.0 pkgutil-resolve-name==1.3.10 -platformdirs==2.5.2 +platformdirs==2.5.4 pluggy==1.0.0 pre-commit==2.20.0 prometheus-client==0.15.0 -prompt-toolkit==3.0.31 +prompt-toolkit==3.0.32 protobuf==3.19.6 -psutil==5.9.3 +psutil==5.9.4 ptyprocess==0.7.0 pure-eval==0.2.2 py==1.11.0 @@ -165,9 +163,9 @@ pydata-sphinx-theme==0.8.1 pydocstyle==6.1.1 pyflakes==2.5.0 pygments==2.13.0 -pylint==2.15.5 +pylint==2.15.6 pyparsing==3.0.9 -pyrsistent==0.19.1 +pyrsistent==0.19.2 pytest==7.2.0 pytest-benchmark==4.0.0 pytest-cov==4.0.0 @@ -179,8 +177,8 @@ pytz==2022.6 pyyaml==6.0 pyzmq==24.0.1 qrules==0.9.7 -qtconsole==5.3.2 -qtpy==2.2.1 +qtconsole==5.4.0 +qtpy==2.3.0 requests==2.28.1 requests-oauthlib==1.3.1 restructuredtext-lint==1.4.0 @@ -194,9 +192,9 @@ soupsieve==2.3.2.post1 sphinx==4.5.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==0.3.3 -sphinx-codeautolink==0.12.0 +sphinx-codeautolink==0.12.1 sphinx-comments==0.0.3 -sphinx-copybutton==0.5.0 +sphinx-copybutton==0.5.1 sphinx-design==0.3.0 sphinx-thebe==0.1.2 sphinx-togglebutton==0.3.2 @@ -206,16 +204,16 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sphobjinv==2.2.2 -sqlalchemy==1.4.42 -stack-data==0.6.0 +sphobjinv==2.3 +sqlalchemy==1.4.44 +stack-data==0.6.1 sympy==1.11.1 tabulate==0.9.0 -tensorboard==2.10.1 +tensorboard==2.11.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1 -tensorflow==2.10.0 -tensorflow-estimator==2.10.0 +tensorflow==2.11.0 +tensorflow-estimator==2.11.0 tensorflow-io-gcs-filesystem==0.27.0 tensorflow-probability==0.17.0 termcolor==2.1.0 @@ -225,23 +223,23 @@ toml==0.10.2 tomli==2.0.1 tomlkit==0.11.6 tornado==6.2 -tox==3.27.0 +tox==3.27.1 tqdm==4.64.1 traitlets==5.5.0 types-docutils==0.19.1.1 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.1 -types-requests==2.28.11.2 -types-setuptools==65.5.0.2 -types-urllib3==1.26.25.1 +types-pyyaml==6.0.12.2 +types-requests==2.28.11.5 +types-setuptools==65.5.0.3 +types-urllib3==1.26.25.4 typing-extensions==4.4.0 urllib3==1.26.12 -virtualenv==20.16.6 +virtualenv==20.16.7 wcwidth==0.2.5 webencodings==0.5.1 -websocket-client==1.4.1 +websocket-client==1.4.2 werkzeug==2.2.2 -wheel==0.37.1 +wheel==0.38.4 widgetsnbextension==4.0.3 wrapt==1.14.1 zipp==3.10.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index b62d2294..0a8c8d52 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -11,7 +11,7 @@ anyio==3.6.2 aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 -astroid==2.12.12 +astroid==2.12.13 asttokens==2.1.0 astunparse==1.6.3 attrs==22.1.0 @@ -39,8 +39,7 @@ distlib==0.3.6 dm-tree==0.1.7 docutils==0.17.1 entrypoints==0.4 -etils==0.9.0 -exceptiongroup==1.0.0 +exceptiongroup==1.0.4 execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 @@ -53,54 +52,52 @@ flake8-comprehensions==3.10.1 flake8-future-annotations==1.0.0 flake8-plugin-utils==1.3.2 flake8-pytest-style==1.6.0 -flake8-rst-docstrings==0.2.7 +flake8-rst-docstrings==0.3.0 flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" flake8-use-fstring==1.4 flatbuffers==22.10.26 fonttools==4.38.0 gast==0.4.0 -google-auth==2.14.0 +google-auth==2.14.1 google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 -greenlet==2.0.0 +greenlet==2.0.1 grpcio==1.50.0 h5py==3.7.0 hepunits==2.3.0 -identify==2.5.8 +identify==2.5.9 idna==3.4 imagesize==1.4.1 iminuit==2.17.0 importlib-metadata==5.0.0 -importlib-resources==5.10.0 iniconfig==1.1.1 -ipykernel==6.17.0 +ipykernel==6.17.1 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 ipywidgets==8.0.2 isort==5.10.1 -jax==0.3.23 -jaxlib==0.3.22 +jax==0.3.25 +jaxlib==0.3.25 jedi==0.18.1 jinja2==3.1.2 json5==0.9.10 -jsonschema==4.16.0 +jsonschema==4.17.0 jupyter==1.0.0 jupyter-cache==0.5.0 -jupyter-client==7.4.4 +jupyter-client==7.4.7 jupyter-console==6.4.4 -jupyter-core==4.11.2 -jupyter-server==1.21.0 +jupyter-core==5.0.0 +jupyter-server==1.23.2 jupyterlab==3.5.0 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 jupyterlab-myst==0.1.6 jupyterlab-pygments==0.2.2 -jupyterlab-server==2.16.2 +jupyterlab-server==2.16.3 jupyterlab-widgets==3.0.3 -keras==2.10.0 -keras-preprocessing==1.1.2 +keras==2.11.0 kiwisolver==1.4.4 lazy-object-proxy==1.8.0 libclang==14.0.6 @@ -109,27 +106,27 @@ llvmlite==0.39.1 markdown==3.4.1 markdown-it-py==2.1.0 markupsafe==2.1.1 -matplotlib==3.6.1 +matplotlib==3.6.2 matplotlib-inline==0.1.6 mccabe==0.7.0 mdit-py-plugins==0.3.1 mdurl==0.1.2 mistune==2.0.4 mpmath==1.2.1 -mypy==0.982 +mypy==0.991 mypy-extensions==0.4.3 myst-nb==0.17.1 myst-parser==0.18.1 -nbclassic==0.4.7 +nbclassic==0.4.8 nbclient==0.5.13 -nbconvert==7.2.3 +nbconvert==7.2.5 nbformat==5.7.0 nbmake==1.3.0 nest-asyncio==1.5.6 nodeenv==1.7.0 notebook==6.5.2 -notebook-shim==0.2.0 -numba==0.56.3 +notebook-shim==0.2.2 +numba==0.56.4 numpy==1.23.4 oauthlib==3.2.2 opt-einsum==3.3.0 @@ -137,20 +134,20 @@ packaging==21.3 pandas==1.5.1 pandocfilters==1.5.0 parso==0.8.3 -particle==0.20.1 -pathspec==0.10.1 +particle==0.21.0 +pathspec==0.10.2 pep8-naming==0.13.2 pexpect==4.8.0 phasespace==1.7.0 pickleshare==0.7.5 pillow==9.3.0 -platformdirs==2.5.2 +platformdirs==2.5.4 pluggy==1.0.0 pre-commit==2.20.0 prometheus-client==0.15.0 -prompt-toolkit==3.0.31 +prompt-toolkit==3.0.32 protobuf==3.19.6 -psutil==5.9.3 +psutil==5.9.4 ptyprocess==0.7.0 pure-eval==0.2.2 py==1.11.0 @@ -164,9 +161,9 @@ pydata-sphinx-theme==0.8.1 pydocstyle==6.1.1 pyflakes==2.5.0 pygments==2.13.0 -pylint==2.15.5 +pylint==2.15.6 pyparsing==3.0.9 -pyrsistent==0.19.1 +pyrsistent==0.19.2 pytest==7.2.0 pytest-benchmark==4.0.0 pytest-cov==4.0.0 @@ -178,8 +175,8 @@ pytz==2022.6 pyyaml==6.0 pyzmq==24.0.1 qrules==0.9.7 -qtconsole==5.3.2 -qtpy==2.2.1 +qtconsole==5.4.0 +qtpy==2.3.0 requests==2.28.1 requests-oauthlib==1.3.1 restructuredtext-lint==1.4.0 @@ -193,9 +190,9 @@ soupsieve==2.3.2.post1 sphinx==4.5.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==0.3.3 -sphinx-codeautolink==0.12.0 +sphinx-codeautolink==0.12.1 sphinx-comments==0.0.3 -sphinx-copybutton==0.5.0 +sphinx-copybutton==0.5.1 sphinx-design==0.3.0 sphinx-thebe==0.1.2 sphinx-togglebutton==0.3.2 @@ -205,16 +202,16 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sphobjinv==2.2.2 -sqlalchemy==1.4.42 -stack-data==0.6.0 +sphobjinv==2.3 +sqlalchemy==1.4.44 +stack-data==0.6.1 sympy==1.11.1 tabulate==0.9.0 -tensorboard==2.10.1 +tensorboard==2.11.0 tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1 -tensorflow==2.10.0 -tensorflow-estimator==2.10.0 +tensorflow==2.11.0 +tensorflow-estimator==2.11.0 tensorflow-io-gcs-filesystem==0.27.0 tensorflow-probability==0.17.0 termcolor==2.1.0 @@ -224,23 +221,23 @@ toml==0.10.2 tomli==2.0.1 tomlkit==0.11.6 tornado==6.2 -tox==3.27.0 +tox==3.27.1 tqdm==4.64.1 traitlets==5.5.0 types-docutils==0.19.1.1 types-pkg-resources==0.1.3 -types-pyyaml==6.0.12.1 -types-requests==2.28.11.2 -types-setuptools==65.5.0.2 -types-urllib3==1.26.25.1 +types-pyyaml==6.0.12.2 +types-requests==2.28.11.5 +types-setuptools==65.5.0.3 +types-urllib3==1.26.25.4 typing-extensions==4.4.0 urllib3==1.26.12 -virtualenv==20.16.6 +virtualenv==20.16.7 wcwidth==0.2.5 webencodings==0.5.1 -websocket-client==1.4.1 +websocket-client==1.4.2 werkzeug==2.2.2 -wheel==0.37.1 +wheel==0.38.4 widgetsnbextension==4.0.3 wrapt==1.14.1 zipp==3.10.0 From 62d1e6ad727a2e3938c8cd395380c1adcc9a23c4 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:19:13 +0100 Subject: [PATCH 03/23] DX: implement caching for pre-commit and mypy --- .github/workflows/ci-style.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-style.yml b/.github/workflows/ci-style.yml index 95ee540a..4e3df73a 100644 --- a/.github/workflows/ci-style.yml +++ b/.github/workflows/ci-style.yml @@ -31,13 +31,24 @@ jobs: run: | python -m pip install --upgrade pip pip install -c .constraints/py3.8.txt -e .[sty] + - name: Retrieve pre-commit cache + uses: actions/cache@v3 + with: + path: ~/.cache/pre-commit/ + key: | + pre-commit-${{ hashFiles('.pre-commit-config.yaml') }} + - name: Retrieve mypy cache + uses: actions/cache@v3 + with: + path: .mypy_cache/ + key: | + mypy-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} - name: Run non-local pre-commit hooks run: | pre-commit run flake8 -a --color always pre-commit run mypy -a --color always pre-commit run pylint -a --color always - name: Run pre-commit hooks that don't work on pre-commit.ci - # cspell:ignore editorconfig run: | pre-commit run editorconfig-checker -a --color always pre-commit run pyright -a --color always From d5d26179f1a0ef33f2bd7f485c1a4c4b2a324bd8 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:25:20 +0100 Subject: [PATCH 04/23] FIX: make `Estimator` call abstract https://github.com/ComPWA/tensorwaves/actions/runs/3504245141/jobs/5869810766#step:7:41 --- src/tensorwaves/interface.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tensorwaves/interface.py b/src/tensorwaves/interface.py index b30a9918..930be989 100644 --- a/src/tensorwaves/interface.py +++ b/src/tensorwaves/interface.py @@ -80,6 +80,7 @@ class Estimator(Function[Mapping[str, ParameterValue], float]): .. automethod:: __call__ """ + @abstractmethod def __call__(self, parameters: Mapping[str, ParameterValue]) -> float: """Compute estimator value for this combination of parameter values.""" From 60cdba73aaaa9d23a54ac8faec41ac903df0e8cf Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:29:20 +0100 Subject: [PATCH 05/23] MAINT: remove redundant comments --- .github/workflows/ci-style.yml | 3 +-- .github/workflows/ci-tests.yml | 12 ++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci-style.yml b/.github/workflows/ci-style.yml index 4e3df73a..76428482 100644 --- a/.github/workflows/ci-style.yml +++ b/.github/workflows/ci-style.yml @@ -19,8 +19,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v4 + - uses: actions/setup-python@v4 with: cache: pip cache-dependency-path: | diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 084dabbd..c21582e7 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -36,8 +36,7 @@ jobs: python-version: ["3.7"] steps: - uses: actions/checkout@master - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + - uses: actions/setup-python@v4 with: cache: pip cache-dependency-path: | @@ -93,8 +92,7 @@ jobs: python-version: "3.7" steps: - uses: actions/checkout@v3 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + - uses: actions/setup-python@v4 with: cache: pip cache-dependency-path: | @@ -131,8 +129,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - name: Set up Python 3.9 - uses: actions/setup-python@v4 + - uses: actions/setup-python@v4 with: cache: pip cache-dependency-path: | @@ -163,8 +160,7 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - - name: Set up Python 3.8 - uses: actions/setup-python@v4 + - uses: actions/setup-python@v4 with: cache: pip cache-dependency-path: | From 3ae7e12097fd533f13886ecad12a0bb4399a53f6 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:47:21 +0100 Subject: [PATCH 06/23] TEMP: remove repo-maintenance pre-commit hook --- .pre-commit-config.yaml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 77dfec98..3238b274 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,20 +43,6 @@ repos: )$ - id: trailing-whitespace - - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.150 - hooks: - - id: check-dev-files - args: - - --pin-requirements=monthly - - id: fix-nbformat-version - - id: format-setup-cfg - - id: set-nb-cells - args: - - --add-install-cell - - --additional-packages=IPython - - --extras-require=doc,jax,pwa,viz - - repo: https://github.com/psf/black rev: 22.10.0 hooks: From 70f115b355302b1fcae6226759c50573b869c6a3 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 17:58:46 +0100 Subject: [PATCH 07/23] MAINT: cache directly with actions/cache actions/setup-python does not have the option to insert job names. This is needed to avoid cache clashes between different jobs. --- .github/workflows/benchmark.yml | 11 ++++++--- .github/workflows/cd.yml | 4 --- .github/workflows/ci-docs.yml | 11 ++++++--- .github/workflows/ci-style.yml | 24 ++++++------------ .github/workflows/ci-tests.yml | 44 +++++++++++++++++++++------------ .github/workflows/linkcheck.yml | 10 +++++--- 6 files changed, 56 insertions(+), 48 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 3bb8a605..ff809bab 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -15,12 +15,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + - uses: actions/cache@v3 + with: + key: | + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + path: | + .pytest_cache + ~/.cache/pip/ - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: "3.9" - name: Install dependencies run: | diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 29916734..512f76ff 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -39,10 +39,6 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: "3.8" - name: Install dependencies run: | diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index a5738a3e..57ffe065 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -19,12 +19,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + - uses: actions/cache@v3 + with: + key: | + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + path: | + ./docs/_build + ~/.cache/pip/ - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: "3.8" - name: Install dependencies run: | diff --git a/.github/workflows/ci-style.yml b/.github/workflows/ci-style.yml index 76428482..131b8593 100644 --- a/.github/workflows/ci-style.yml +++ b/.github/workflows/ci-style.yml @@ -19,29 +19,21 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + - uses: actions/cache@v3 + with: + key: | + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', '.pre-commit-config.yaml') }} + path: | + .mypy_cache/ + ~/.cache/pip/ + ~/.cache/pre-commit/ - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: "3.8" - name: Install dependencies run: | python -m pip install --upgrade pip pip install -c .constraints/py3.8.txt -e .[sty] - - name: Retrieve pre-commit cache - uses: actions/cache@v3 - with: - path: ~/.cache/pre-commit/ - key: | - pre-commit-${{ hashFiles('.pre-commit-config.yaml') }} - - name: Retrieve mypy cache - uses: actions/cache@v3 - with: - path: .mypy_cache/ - key: | - mypy-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} - name: Run non-local pre-commit hooks run: | pre-commit run flake8 -a --color always diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index c21582e7..8a7daa38 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -36,12 +36,15 @@ jobs: python-version: ["3.7"] steps: - uses: actions/checkout@master + - uses: actions/cache@v3 + with: + key: | + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + path: | + .pytest_cache + ~/.cache/pip/ - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: ${{ matrix.python-version }} - name: Install dependencies run: | @@ -92,12 +95,15 @@ jobs: python-version: "3.7" steps: - uses: actions/checkout@v3 + - uses: actions/cache@v3 + with: + key: | + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + path: | + .pytest_cache + ~/.cache/pip/ - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: ${{ matrix.python-version }} - name: Install dependencies run: | @@ -129,12 +135,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + - uses: actions/cache@v3 + with: + key: | + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + path: | + .pytest_cache + ~/.cache/pip/ - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: "3.9" - name: Install dependencies run: | @@ -160,12 +169,15 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + - uses: actions/cache@v3 + with: + key: | + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + path: | + .pytest_cache + ~/.cache/pip/ - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: "3.8" - name: Install dependencies run: | diff --git a/.github/workflows/linkcheck.yml b/.github/workflows/linkcheck.yml index b583ffaa..0617a4e0 100644 --- a/.github/workflows/linkcheck.yml +++ b/.github/workflows/linkcheck.yml @@ -19,12 +19,14 @@ jobs: runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + - uses: actions/cache@v3 + with: + key: | + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + path: | + ~/.cache/pip/ - uses: actions/setup-python@v4 with: - cache: pip - cache-dependency-path: | - .constraints/py3.*.txt - setup.cfg python-version: "3.8" - name: Install dependencies run: | From 391eb11887ca9cd45a8d1be72721ee7da2359de5 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 18:01:07 +0100 Subject: [PATCH 08/23] MAINT: include `src` folder in cache for docs job Notebook output depends on `src` code as well. --- .github/workflows/ci-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 57ffe065..0cb53acc 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -22,7 +22,7 @@ jobs: - uses: actions/cache@v3 with: key: | - ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg', 'src/**') }} path: | ./docs/_build ~/.cache/pip/ From 4895165988ab728a2b3deb72f599e74e7afe6f6a Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 18:16:15 +0100 Subject: [PATCH 09/23] FIX: include matrix values in cache keys --- .github/workflows/ci-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 8a7daa38..b931349a 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/cache@v3 with: key: | - ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-py${{ matrix.python-version }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} path: | .pytest_cache ~/.cache/pip/ @@ -98,7 +98,7 @@ jobs: - uses: actions/cache@v3 with: key: | - ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-py${{ matrix.python-version }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} path: | .pytest_cache ~/.cache/pip/ From a55e9b8f9eba797940978f7c2eef5c344c013982 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 18:21:09 +0100 Subject: [PATCH 10/23] MAINT: ignore mypy issues in `_relink_references.py` --- docs/_relink_references.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_relink_references.py b/docs/_relink_references.py index 64f6b0cc..04883296 100644 --- a/docs/_relink_references.py +++ b/docs/_relink_references.py @@ -42,7 +42,7 @@ def _new_type_to_xref( target: str, - env: BuildEnvironment = None, + env: BuildEnvironment = None, # type: ignore[assignment] suppress_prefix: bool = False, ) -> pending_xref: reftype, target, title, refspecific = parse_reftarget(target, suppress_prefix) @@ -63,7 +63,7 @@ def _new_type_to_xref( # https://github.com/sphinx-doc/sphinx/blob/v4.3.2/sphinx/domains/python.py#L83-L107 def _new_type_to_xref( target: str, - env: BuildEnvironment = None, + env: BuildEnvironment = None, # type: ignore[assignment] suppress_prefix: bool = False, ) -> pending_xref: # pylint: disable=unused-argument From 3c0cb00b251d06e6c73212d9e425ebcf1ad3e6c9 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 18:29:48 +0100 Subject: [PATCH 11/23] MAINT: upgrade `actions/checkout` to v3 --- .github/workflows/ci-tests.yml | 2 +- .github/workflows/pr-linting.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index b931349a..4fac076e 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -35,7 +35,7 @@ jobs: os: [ubuntu-20.04] python-version: ["3.7"] steps: - - uses: actions/checkout@master + - uses: actions/checkout@v3 - uses: actions/cache@v3 with: key: | diff --git a/.github/workflows/pr-linting.yml b/.github/workflows/pr-linting.yml index 12dcde03..4549863d 100644 --- a/.github/workflows/pr-linting.yml +++ b/.github/workflows/pr-linting.yml @@ -28,6 +28,6 @@ jobs: name: Check title runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - run: npm install @commitlint/config-conventional - uses: JulienKode/pull-request-name-linter-action@v0.5.0 From ba01eaffaad9e66b8a7a21824d3b762268227739 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 18:40:23 +0100 Subject: [PATCH 12/23] Revert "TEMP: remove repo-maintenance pre-commit hook" This reverts commit 3ae7e12097fd533f13886ecad12a0bb4399a53f6. --- .pre-commit-config.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3238b274..77dfec98 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -43,6 +43,20 @@ repos: )$ - id: trailing-whitespace + - repo: https://github.com/ComPWA/repo-maintenance + rev: 0.0.150 + hooks: + - id: check-dev-files + args: + - --pin-requirements=monthly + - id: fix-nbformat-version + - id: format-setup-cfg + - id: set-nb-cells + args: + - --add-install-cell + - --additional-packages=IPython + - --extras-require=doc,jax,pwa,viz + - repo: https://github.com/psf/black rev: 22.10.0 hooks: From eaf1c9ec17620d669f8c97e9f4bdd890d3e46abb Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 18:41:43 +0100 Subject: [PATCH 13/23] MAINT: autoupdate pre-commit config --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 77dfec98..5d5c2643 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.150 + rev: 0.0.151 hooks: - id: check-dev-files args: From 78569f39f169a6a011db4a6c7eed4e869ca37f0c Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 18:59:22 +0100 Subject: [PATCH 14/23] MAINT: split lines in `strategy.matrix` definition --- .github/workflows/ci-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 4fac076e..b53737af 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -32,8 +32,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04] - python-version: ["3.7"] + os: + - ubuntu-20.04 + python-version: + - "3.7" steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 From 02e94520c3fb6233a0ca573c3a507a8648bcb25e Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 20:54:18 +0100 Subject: [PATCH 15/23] MAINT: set `PYTHONHASHSEED=0` in workflows --- .github/workflows/benchmark.yml | 2 ++ .github/workflows/ci-docs.yml | 2 ++ .github/workflows/ci-tests.yml | 2 ++ .pre-commit-config.yaml | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index ff809bab..0e531e81 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -1,4 +1,6 @@ name: Benchmark +env: + PYTHONHASHSEED: "0" on: push: diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index 0cb53acc..cc7244cc 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -1,4 +1,6 @@ name: CI-docs +env: + PYTHONHASHSEED: "0" on: push: diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index b53737af..ab78b1d6 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -1,4 +1,6 @@ name: pytest +env: + PYTHONHASHSEED: "0" on: push: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5d5c2643..39918f6d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.151 + rev: 0.0.152 hooks: - id: check-dev-files args: From 18aa86c04ec462fbee5d7c25e1687765e8190de8 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 20:58:35 +0100 Subject: [PATCH 16/23] MAINT: cache `.sympy-cache` directories --- .github/workflows/benchmark.yml | 1 + .github/workflows/ci-docs.yml | 1 + .github/workflows/ci-tests.yml | 4 ++++ .pre-commit-config.yaml | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 0e531e81..23c3698b 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -24,6 +24,7 @@ jobs: path: | .pytest_cache ~/.cache/pip/ + ~/.sympy-cache*/ - uses: actions/setup-python@v4 with: python-version: "3.9" diff --git a/.github/workflows/ci-docs.yml b/.github/workflows/ci-docs.yml index cc7244cc..890a15c7 100644 --- a/.github/workflows/ci-docs.yml +++ b/.github/workflows/ci-docs.yml @@ -28,6 +28,7 @@ jobs: path: | ./docs/_build ~/.cache/pip/ + ~/.sympy-cache*/ - uses: actions/setup-python@v4 with: python-version: "3.8" diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index ab78b1d6..269bed04 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -47,6 +47,7 @@ jobs: path: | .pytest_cache ~/.cache/pip/ + ~/.sympy-cache*/ - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -106,6 +107,7 @@ jobs: path: | .pytest_cache ~/.cache/pip/ + ~/.sympy-cache*/ - uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} @@ -146,6 +148,7 @@ jobs: path: | .pytest_cache ~/.cache/pip/ + ~/.sympy-cache*/ - uses: actions/setup-python@v4 with: python-version: "3.9" @@ -180,6 +183,7 @@ jobs: path: | .pytest_cache ~/.cache/pip/ + ~/.sympy-cache*/ - uses: actions/setup-python@v4 with: python-version: "3.8" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 39918f6d..4510105e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.152 + rev: 0.0.153 hooks: - id: check-dev-files args: From d993cd2851c9e9e4dcae5820411ee2bd73810a5a Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 19 Nov 2022 21:11:07 +0100 Subject: [PATCH 17/23] MAINT: define all jobs in pytest workflow with matrix --- .github/workflows/ci-tests.yml | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 269bed04..38c8842d 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -138,24 +138,30 @@ jobs: pytest-jax: name: Unit tests (JAX only) - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: + - ubuntu-20.04 + python-version: + - "3.9" steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 with: key: | - ${{ github.workflow }}-${{ github.job }}-${{ runner.os }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} + ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }}-py${{ matrix.python-version }}-${{ hashFiles('.constraints/py3.*.txt', 'setup.cfg') }} path: | .pytest_cache ~/.cache/pip/ ~/.sympy-cache*/ - uses: actions/setup-python@v4 with: - python-version: "3.9" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -c .constraints/py3.9.txt -e .[test,jax] tox + pip install -c .constraints/py${{ matrix.python-version }}.txt -e .[test,jax] tox - name: Install specific version of AmpForm if: github.event.inputs.ampform-version run: | @@ -173,7 +179,13 @@ jobs: pytest-notebook: name: Run all notebooks if: join(github.event.inputs.*) - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: + - ubuntu-20.04 + python-version: + - "3.8" steps: - uses: actions/checkout@v3 - uses: actions/cache@v3 @@ -186,11 +198,11 @@ jobs: ~/.sympy-cache*/ - uses: actions/setup-python@v4 with: - python-version: "3.8" + python-version: ${{ matrix.python-version }} - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -c .constraints/py3.8.txt -e .[doc,test] tox + pip install -c .constraints/py${{ matrix.python-version }}.txt -e .[doc,test] tox sudo apt-get -y install graphviz - name: Install specific version of AmpForm if: github.event.inputs.ampform-version From d90e131695c9f07ed4f484919c7c49252dbd8762 Mon Sep 17 00:00:00 2001 From: GitHub Date: Sun, 20 Nov 2022 15:20:00 +0000 Subject: [PATCH 18/23] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 6 +++--- .constraints/py3.7.txt | 4 ++-- .constraints/py3.8.txt | 6 +++--- .constraints/py3.9.txt | 6 +++--- .pre-commit-config.yaml | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 50869a2a..a6f08271 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -127,7 +127,7 @@ nodeenv==1.7.0 notebook==6.5.2 notebook-shim==0.2.2 numba==0.56.4 -numpy==1.23.4 +numpy==1.23.5 oauthlib==3.2.2 opt-einsum==3.3.0 packaging==21.3 @@ -214,7 +214,7 @@ tensorflow==2.11.0 tensorflow-estimator==2.11.0 tensorflow-io-gcs-filesystem==0.27.0 tensorflow-probability==0.17.0 -termcolor==2.1.0 +termcolor==2.1.1 terminado==0.17.0 tinycss2==1.2.1 toml==0.10.2 @@ -228,7 +228,7 @@ types-docutils==0.19.1.1 types-pkg-resources==0.1.3 types-pyyaml==6.0.12.2 types-requests==2.28.11.5 -types-setuptools==65.5.0.3 +types-setuptools==65.6.0.0 types-urllib3==1.26.25.4 typing-extensions==4.4.0 urllib3==1.26.12 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 797eebf3..9bbe0383 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -211,7 +211,7 @@ tensorflow==2.11.0 tensorflow-estimator==2.11.0 tensorflow-io-gcs-filesystem==0.27.0 tensorflow-probability==0.17.0 -termcolor==2.1.0 +termcolor==2.1.1 terminado==0.17.0 tinycss2==1.2.1 toml==0.10.2 @@ -226,7 +226,7 @@ types-docutils==0.19.1.1 types-pkg-resources==0.1.3 types-pyyaml==6.0.12.2 types-requests==2.28.11.5 -types-setuptools==65.5.0.3 +types-setuptools==65.6.0.0 types-urllib3==1.26.25.4 typing-extensions==4.4.0 urllib3==1.26.12 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index bdbbbd33..071bad54 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -128,7 +128,7 @@ nodeenv==1.7.0 notebook==6.5.2 notebook-shim==0.2.2 numba==0.56.4 -numpy==1.23.4 +numpy==1.23.5 oauthlib==3.2.2 opt-einsum==3.3.0 packaging==21.3 @@ -216,7 +216,7 @@ tensorflow==2.11.0 tensorflow-estimator==2.11.0 tensorflow-io-gcs-filesystem==0.27.0 tensorflow-probability==0.17.0 -termcolor==2.1.0 +termcolor==2.1.1 terminado==0.17.0 tinycss2==1.2.1 toml==0.10.2 @@ -230,7 +230,7 @@ types-docutils==0.19.1.1 types-pkg-resources==0.1.3 types-pyyaml==6.0.12.2 types-requests==2.28.11.5 -types-setuptools==65.5.0.3 +types-setuptools==65.6.0.0 types-urllib3==1.26.25.4 typing-extensions==4.4.0 urllib3==1.26.12 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 0a8c8d52..eb3ca58b 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -127,7 +127,7 @@ nodeenv==1.7.0 notebook==6.5.2 notebook-shim==0.2.2 numba==0.56.4 -numpy==1.23.4 +numpy==1.23.5 oauthlib==3.2.2 opt-einsum==3.3.0 packaging==21.3 @@ -214,7 +214,7 @@ tensorflow==2.11.0 tensorflow-estimator==2.11.0 tensorflow-io-gcs-filesystem==0.27.0 tensorflow-probability==0.17.0 -termcolor==2.1.0 +termcolor==2.1.1 terminado==0.17.0 tinycss2==1.2.1 toml==0.10.2 @@ -228,7 +228,7 @@ types-docutils==0.19.1.1 types-pkg-resources==0.1.3 types-pyyaml==6.0.12.2 types-requests==2.28.11.5 -types-setuptools==65.5.0.3 +types-setuptools==65.6.0.0 types-urllib3==1.26.25.4 typing-extensions==4.4.0 urllib3==1.26.12 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 4510105e..f9503158 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.153 + rev: 0.0.157 hooks: - id: check-dev-files args: From 34bb5487da24674fb19505a4a0751a7f6ecc7920 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 20 Nov 2022 15:20:24 +0000 Subject: [PATCH 19/23] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .cspell.json | 7 ++----- .github/workflows/ci-style.yml | 4 ++-- .github/workflows/requirements-cron.yml | 2 +- .prettierignore | 1 - 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.cspell.json b/.cspell.json index b0460087..b58d0d73 100644 --- a/.cspell.json +++ b/.cspell.json @@ -1,10 +1,6 @@ { "allowCompoundWords": true, - "enableFiletypes": [ - "git-commit", - "julia", - "jupyter" - ], + "enableFiletypes": ["git-commit", "julia", "jupyter"], "flagWords": [ "analyse", "colour", @@ -27,6 +23,7 @@ "*.svg", "*particle*.*ml", ".constraints/*.txt", + ".editorconfig", ".flake8*", ".gitignore", ".gitpod.*", diff --git a/.github/workflows/ci-style.yml b/.github/workflows/ci-style.yml index 131b8593..da47a97d 100644 --- a/.github/workflows/ci-style.yml +++ b/.github/workflows/ci-style.yml @@ -35,11 +35,11 @@ jobs: python -m pip install --upgrade pip pip install -c .constraints/py3.8.txt -e .[sty] - name: Run non-local pre-commit hooks - run: | + run: |- pre-commit run flake8 -a --color always pre-commit run mypy -a --color always pre-commit run pylint -a --color always - name: Run pre-commit hooks that don't work on pre-commit.ci - run: | + run: |- pre-commit run editorconfig-checker -a --color always pre-commit run pyright -a --color always diff --git a/.github/workflows/requirements-cron.yml b/.github/workflows/requirements-cron.yml index 1390ca96..629be607 100644 --- a/.github/workflows/requirements-cron.yml +++ b/.github/workflows/requirements-cron.yml @@ -2,7 +2,7 @@ name: Requirements (scheduled) on: schedule: - - cron: "0 3 1 */1 *" + - cron: "0 3 7 */1 *" workflow_dispatch: jobs: diff --git a/.prettierignore b/.prettierignore index 4fffca73..ea965b83 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,3 +1,2 @@ *.ipynb -.cspell.json LICENSE From 9fba6de91fdbd9c93c71bb82aec8b3f58dd5d36a Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Mon, 21 Nov 2022 19:14:45 +0100 Subject: [PATCH 20/23] MAINT: remove deprecated `set-output` https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ --- .cspell.json | 524 +++++++++++++------------- .editorconfig | 7 +- .github/workflows/requirements-pr.yml | 5 +- .pre-commit-config.yaml | 2 +- 4 files changed, 269 insertions(+), 269 deletions(-) diff --git a/.cspell.json b/.cspell.json index b58d0d73..54b417d7 100644 --- a/.cspell.json +++ b/.cspell.json @@ -1,264 +1,264 @@ { - "allowCompoundWords": true, - "enableFiletypes": ["git-commit", "julia", "jupyter"], - "flagWords": [ - "analyse", - "colour", - "comparision", - "favour", - "flavour", - "hte", - "optimise", - "paramater", - "parmater", - "transision", - "transisions" - ], - "ignorePaths": [ - "**/.cspell.json", - "*.bib", - "*.ico", - "*.root", - "*.rst_t", - "*.svg", - "*particle*.*ml", - ".constraints/*.txt", - ".editorconfig", - ".flake8*", - ".gitignore", - ".gitpod.*", - ".mypy.ini", - ".pre-commit-config.yaml", - ".prettierignore", - ".pydocstyle*", - ".pylintrc", - ".readthedocs.yml", - ".vscode/*", - ".vscode/.gitignore", - ".zenodo.json", - "codecov.yml", - "Dockerfile", - "docs/_templates/*", - "docs/adr/*/*", - "docs/conf.py", - "labels.toml", - "Makefile", - "Manifest.toml", - "Project.toml", - "pyproject.toml", - "pyrightconfig.json", - "pytest.ini", - "requirements*.txt", - "setup.cfg", - "setup.py", - "tox.ini", - "typings" - ], - "ignoreWords": [ - "absl", - "allclose", - "ampform", - "arange", - "asdot", - "atfi", - "autoupdate", - "axhline", - "axvline", - "bdist", - "bgcolor", - "cano", - "capsys", - "celltoolbar", - "classmethod", - "cmap", - "cmin", - "codacy", - "codecov", - "codemirror", - "colab", - "commitlint", - "compwa", - "concat", - "coolwarm", - "darkred", - "docnb", - "doctest", - "doctests", - "dotprint", - "dphi", - "dtype", - "eqnarray", - "eval", - "evalf", - "figsize", - "filterwarnings", - "fmin", - "fontsize", - "fval", - "genindex", - "getsource", - "gridspec", - "heli", - "histtype", - "hspace", - "iloc", - "imag", - "iminuit", - "indeterministic", - "ioff", - "ipykernel", - "isinstance", - "isort", - "isrealobj", - "jupyterlab", - "keras", - "kernelspec", - "kwargs", - "lambdification", - "lambdified", - "lambdify", - "lambdifygenerated", - "linestyle", - "linewidth", - "linkcheck", - "linspace", - "logdir", - "macos", - "MAINT", - "markdownlint", - "mathbf", - "mathrm", - "maxdepth", - "meshgrid", - "mimetype", - "modindex", - "mprime", - "nbconvert", - "nbformat", - "nbins", - "nbody", - "nbsphinx", - "ncalls", - "ncols", - "ndarray", - "Nelder", - "noqa", - "noreply", - "nrows", - "numba", - "outfile", - "pandoc", - "pcolormesh", - "phasespace", - "phsp", - "precommit", - "prefactor", - "preorder", - "prereleased", - "pwa's", - "py's", - "pygments", - "pypi", - "pyplot", - "pyproject", - "pyright", - "pytestconfig", - "qrules", - "rightarrow", - "rtfd", - "rtol", - "scipy", - "sdist", - "seealso", - "sharex", - "sharey", - "startswith", - "staticmethod", - "subsys", - "suptitle", - "timeit", - "tolist", - "tqdm", - "unflatten", - "unflattened", - "unnormalized", - "unsubscriptable", - "vstack", - "waves's", - "wspace", - "xdata", - "xlabel", - "xlim", - "xreplace", - "xrightarrow", - "xticklabels", - "xticks", - "ydata", - "ylabel", - "ylim", - "yticks" - ], - "language": "en-US", - "version": "0.2", - "words": [ - "backends", - "blatt", - "bottomness", - "breit", - "charmness", - "clebsch", - "combi", - "conda", - "cuda", - "deepcopy", - "determinator", - "determinators", - "docstrings", - "flatté", - "functors", - "gaussians", - "gell", - "gordan", - "graphviz", - "helicity", - "imap", - "ipynb", - "ipython", - "ipywidgets", - "isospin", - "itertools", - "jsonschema", - "jupyter", - "lambdifying", - "lineshape", - "mathbb", - "matplotlib", - "mkdir", - "mypy", - "nishijima", - "numpy", - "optimizable", - "permalinks", - "pycompwa", - "pydocstyle", - "pylint", - "pytest", - "setuptools", - "spflueger", - "struct", - "sympy", - "tensorboard", - "tensorflow", - "tensorwaves", - "toctree", - "topness", - "traceback", - "unbinned", - "vectorize", - "venv", - "weisskopf", - "xcode", - "Zenodo", - "zfit" - ] + "allowCompoundWords": true, + "enableFiletypes": ["git-commit", "julia", "jupyter"], + "flagWords": [ + "analyse", + "colour", + "comparision", + "favour", + "flavour", + "hte", + "optimise", + "paramater", + "parmater", + "transision", + "transisions" + ], + "ignorePaths": [ + "**/.cspell.json", + "*.bib", + "*.ico", + "*.root", + "*.rst_t", + "*.svg", + "*particle*.*ml", + ".constraints/*.txt", + ".editorconfig", + ".flake8*", + ".gitignore", + ".gitpod.*", + ".mypy.ini", + ".pre-commit-config.yaml", + ".prettierignore", + ".pydocstyle*", + ".pylintrc", + ".readthedocs.yml", + ".vscode/*", + ".vscode/.gitignore", + ".zenodo.json", + "codecov.yml", + "Dockerfile", + "docs/_templates/*", + "docs/adr/*/*", + "docs/conf.py", + "labels.toml", + "Makefile", + "Manifest.toml", + "Project.toml", + "pyproject.toml", + "pyrightconfig.json", + "pytest.ini", + "requirements*.txt", + "setup.cfg", + "setup.py", + "tox.ini", + "typings" + ], + "ignoreWords": [ + "MAINT", + "Nelder", + "absl", + "allclose", + "ampform", + "arange", + "asdot", + "atfi", + "autoupdate", + "axhline", + "axvline", + "bdist", + "bgcolor", + "cano", + "capsys", + "celltoolbar", + "classmethod", + "cmap", + "cmin", + "codacy", + "codecov", + "codemirror", + "colab", + "commitlint", + "compwa", + "concat", + "coolwarm", + "darkred", + "docnb", + "doctest", + "doctests", + "dotprint", + "dphi", + "dtype", + "eqnarray", + "eval", + "evalf", + "figsize", + "filterwarnings", + "fmin", + "fontsize", + "fval", + "genindex", + "getsource", + "gridspec", + "heli", + "histtype", + "hspace", + "iloc", + "imag", + "iminuit", + "indeterministic", + "ioff", + "ipykernel", + "isinstance", + "isort", + "isrealobj", + "jupyterlab", + "keras", + "kernelspec", + "kwargs", + "lambdification", + "lambdified", + "lambdify", + "lambdifygenerated", + "linestyle", + "linewidth", + "linkcheck", + "linspace", + "logdir", + "macos", + "markdownlint", + "mathbf", + "mathrm", + "maxdepth", + "meshgrid", + "mimetype", + "modindex", + "mprime", + "nbconvert", + "nbformat", + "nbins", + "nbody", + "nbsphinx", + "ncalls", + "ncols", + "ndarray", + "noqa", + "noreply", + "nrows", + "numba", + "outfile", + "pandoc", + "pcolormesh", + "phasespace", + "phsp", + "precommit", + "prefactor", + "preorder", + "prereleased", + "pwa's", + "py's", + "pygments", + "pypi", + "pyplot", + "pyproject", + "pyright", + "pytestconfig", + "qrules", + "rightarrow", + "rtfd", + "rtol", + "scipy", + "sdist", + "seealso", + "sharex", + "sharey", + "startswith", + "staticmethod", + "subsys", + "suptitle", + "timeit", + "tolist", + "tqdm", + "unflatten", + "unflattened", + "unnormalized", + "unsubscriptable", + "vstack", + "waves's", + "wspace", + "xdata", + "xlabel", + "xlim", + "xreplace", + "xrightarrow", + "xticklabels", + "xticks", + "ydata", + "ylabel", + "ylim", + "yticks" + ], + "language": "en-US", + "version": "0.2", + "words": [ + "backends", + "blatt", + "bottomness", + "breit", + "charmness", + "clebsch", + "combi", + "conda", + "cuda", + "deepcopy", + "determinator", + "determinators", + "docstrings", + "flatté", + "functors", + "gaussians", + "gell", + "gordan", + "graphviz", + "helicity", + "imap", + "ipynb", + "ipython", + "ipywidgets", + "isospin", + "itertools", + "jsonschema", + "jupyter", + "lambdifying", + "lineshape", + "mathbb", + "matplotlib", + "mkdir", + "mypy", + "nishijima", + "numpy", + "optimizable", + "permalinks", + "pycompwa", + "pydocstyle", + "pylint", + "pytest", + "setuptools", + "spflueger", + "struct", + "sympy", + "tensorboard", + "tensorflow", + "tensorwaves", + "toctree", + "topness", + "traceback", + "unbinned", + "vectorize", + "venv", + "weisskopf", + "xcode", + "Zenodo", + "zfit" + ] } diff --git a/.editorconfig b/.editorconfig index c184b58e..2737f6f8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,14 +8,13 @@ insert_final_newline = true trim_trailing_whitespace = true [*.ipynb] -indent_size = 1 +indent_size = unset [*.{py,toml}] indent_size = 4 -# when adding words through vscode, this is the resulting output format -[.cspell.json] -indent_size = 4 +[LICENSE] +indent_size = unset [setup.cfg] indent_size = 4 diff --git a/.github/workflows/requirements-pr.yml b/.github/workflows/requirements-pr.yml index 99372fab..254c9856 100644 --- a/.github/workflows/requirements-pr.yml +++ b/.github/workflows/requirements-pr.yml @@ -18,8 +18,9 @@ jobs: fetch-depth: 0 - name: Determine dependency changes run: | - DIFF="$(git diff origin/main --color -- .constraints .pre-commit-config.yaml setup.cfg)" - echo ::set-output name=diff::"${DIFF}" + echo 'diff<> $GITHUB_OUTPUT + git diff origin/main --color -- .constraints .pre-commit-config.yaml setup.cfg >> $GITHUB_OUTPUT + echo 'EOF' >> $GITHUB_OUTPUT id: diff outputs: diff: ${{ steps.diff.outputs.diff }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f9503158..e7af57f6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -44,7 +44,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.157 + rev: 0.0.159 hooks: - id: check-dev-files args: From fd8aa87da8174312fc7653bc7cc2fd0e9b106843 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 21 Nov 2022 18:17:56 +0000 Subject: [PATCH 21/23] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 7 ++++--- .constraints/py3.7.txt | 4 ++-- .constraints/py3.8.txt | 7 ++++--- .constraints/py3.9.txt | 7 ++++--- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index a6f08271..e53d945d 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -28,6 +28,7 @@ charset-normalizer==2.1.1 click==8.1.3 cloudpickle==2.2.0 colorama==0.4.6 +comm==0.1.0 contourpy==1.0.6 coverage==6.5.0 cycler==0.11.0 @@ -72,7 +73,7 @@ imagesize==1.4.1 iminuit==2.17.0 importlib-metadata==5.0.0 iniconfig==1.1.1 -ipykernel==6.17.1 +ipykernel==6.18.0 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 @@ -89,7 +90,7 @@ jupyter-cache==0.5.0 jupyter-client==7.4.7 jupyter-console==6.4.4 jupyter-core==5.0.0 -jupyter-server==1.23.2 +jupyter-server==1.23.3 jupyterlab==3.5.0 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 @@ -145,7 +146,7 @@ platformdirs==2.5.4 pluggy==1.0.0 pre-commit==2.20.0 prometheus-client==0.15.0 -prompt-toolkit==3.0.32 +prompt-toolkit==3.0.33 protobuf==3.19.6 psutil==5.9.4 ptyprocess==0.7.0 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 9bbe0383..a32e400b 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -86,7 +86,7 @@ jupyter-cache==0.5.0 jupyter-client==7.4.7 jupyter-console==6.4.4 jupyter-core==4.11.2 -jupyter-server==1.23.2 +jupyter-server==1.23.3 jupyterlab==3.5.0 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 @@ -143,7 +143,7 @@ platformdirs==2.5.4 pluggy==1.0.0 pre-commit==2.20.0 prometheus-client==0.15.0 -prompt-toolkit==3.0.32 +prompt-toolkit==3.0.33 protobuf==3.19.6 psutil==5.9.4 ptyprocess==0.7.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 071bad54..df950948 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -28,6 +28,7 @@ charset-normalizer==2.1.1 click==8.1.3 cloudpickle==2.2.0 colorama==0.4.6 +comm==0.1.0 contourpy==1.0.6 coverage==6.5.0 cycler==0.11.0 @@ -73,7 +74,7 @@ iminuit==2.17.0 importlib-metadata==5.0.0 importlib-resources==5.10.0 iniconfig==1.1.1 -ipykernel==6.17.1 +ipykernel==6.18.0 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 @@ -90,7 +91,7 @@ jupyter-cache==0.5.0 jupyter-client==7.4.7 jupyter-console==6.4.4 jupyter-core==5.0.0 -jupyter-server==1.23.2 +jupyter-server==1.23.3 jupyterlab==3.5.0 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 @@ -147,7 +148,7 @@ platformdirs==2.5.4 pluggy==1.0.0 pre-commit==2.20.0 prometheus-client==0.15.0 -prompt-toolkit==3.0.32 +prompt-toolkit==3.0.33 protobuf==3.19.6 psutil==5.9.4 ptyprocess==0.7.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index eb3ca58b..b7e27286 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -28,6 +28,7 @@ charset-normalizer==2.1.1 click==8.1.3 cloudpickle==2.2.0 colorama==0.4.6 +comm==0.1.0 contourpy==1.0.6 coverage==6.5.0 cycler==0.11.0 @@ -72,7 +73,7 @@ imagesize==1.4.1 iminuit==2.17.0 importlib-metadata==5.0.0 iniconfig==1.1.1 -ipykernel==6.17.1 +ipykernel==6.18.0 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 @@ -89,7 +90,7 @@ jupyter-cache==0.5.0 jupyter-client==7.4.7 jupyter-console==6.4.4 jupyter-core==5.0.0 -jupyter-server==1.23.2 +jupyter-server==1.23.3 jupyterlab==3.5.0 jupyterlab-code-formatter==1.5.3 jupyterlab-markup==1.1.0 @@ -145,7 +146,7 @@ platformdirs==2.5.4 pluggy==1.0.0 pre-commit==2.20.0 prometheus-client==0.15.0 -prompt-toolkit==3.0.32 +prompt-toolkit==3.0.33 protobuf==3.19.6 psutil==5.9.4 ptyprocess==0.7.0 From d1a8adc6b261855c594ced3083ac8480193f0af6 Mon Sep 17 00:00:00 2001 From: GitHub Date: Mon, 21 Nov 2022 23:55:34 +0000 Subject: [PATCH 22/23] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 7 +++---- .constraints/py3.7.txt | 4 ++-- .constraints/py3.8.txt | 7 +++---- .constraints/py3.9.txt | 7 +++---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index e53d945d..17f8fb3c 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -28,7 +28,6 @@ charset-normalizer==2.1.1 click==8.1.3 cloudpickle==2.2.0 colorama==0.4.6 -comm==0.1.0 contourpy==1.0.6 coverage==6.5.0 cycler==0.11.0 @@ -64,7 +63,7 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.1 -grpcio==1.50.0 +grpcio==1.51.0 h5py==3.7.0 hepunits==2.3.0 identify==2.5.9 @@ -73,7 +72,7 @@ imagesize==1.4.1 iminuit==2.17.0 importlib-metadata==5.0.0 iniconfig==1.1.1 -ipykernel==6.18.0 +ipykernel==6.17.1 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 @@ -81,7 +80,7 @@ ipywidgets==8.0.2 isort==5.10.1 jax==0.3.25 jaxlib==0.3.25 -jedi==0.18.1 +jedi==0.18.2 jinja2==3.1.2 json5==0.9.10 jsonschema==4.17.0 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index a32e400b..56a3329c 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -59,7 +59,7 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.1 -grpcio==1.50.0 +grpcio==1.51.0 h5py==3.7.0 hepunits==2.3.0 identify==2.5.9 @@ -77,7 +77,7 @@ ipywidgets==8.0.2 isort==5.10.1 jax==0.3.25 jaxlib==0.3.25 -jedi==0.18.1 +jedi==0.18.2 jinja2==3.1.2 json5==0.9.10 jsonschema==4.17.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index df950948..d760de1a 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -28,7 +28,6 @@ charset-normalizer==2.1.1 click==8.1.3 cloudpickle==2.2.0 colorama==0.4.6 -comm==0.1.0 contourpy==1.0.6 coverage==6.5.0 cycler==0.11.0 @@ -64,7 +63,7 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.1 -grpcio==1.50.0 +grpcio==1.51.0 h5py==3.7.0 hepunits==2.3.0 identify==2.5.9 @@ -74,7 +73,7 @@ iminuit==2.17.0 importlib-metadata==5.0.0 importlib-resources==5.10.0 iniconfig==1.1.1 -ipykernel==6.18.0 +ipykernel==6.17.1 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 @@ -82,7 +81,7 @@ ipywidgets==8.0.2 isort==5.10.1 jax==0.3.25 jaxlib==0.3.25 -jedi==0.18.1 +jedi==0.18.2 jinja2==3.1.2 json5==0.9.10 jsonschema==4.17.0 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index b7e27286..c1b18e5c 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -28,7 +28,6 @@ charset-normalizer==2.1.1 click==8.1.3 cloudpickle==2.2.0 colorama==0.4.6 -comm==0.1.0 contourpy==1.0.6 coverage==6.5.0 cycler==0.11.0 @@ -64,7 +63,7 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.1 -grpcio==1.50.0 +grpcio==1.51.0 h5py==3.7.0 hepunits==2.3.0 identify==2.5.9 @@ -73,7 +72,7 @@ imagesize==1.4.1 iminuit==2.17.0 importlib-metadata==5.0.0 iniconfig==1.1.1 -ipykernel==6.18.0 +ipykernel==6.17.1 ipympl==0.9.2 ipython==8.6.0 ipython-genutils==0.2.0 @@ -81,7 +80,7 @@ ipywidgets==8.0.2 isort==5.10.1 jax==0.3.25 jaxlib==0.3.25 -jedi==0.18.1 +jedi==0.18.2 jinja2==3.1.2 json5==0.9.10 jsonschema==4.17.0 From f7d1b3b7463cee9f8ea029ad42d9d79b24601efe Mon Sep 17 00:00:00 2001 From: GitHub Date: Fri, 25 Nov 2022 10:59:25 +0000 Subject: [PATCH 23/23] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 22 +++++++++++----------- .constraints/py3.7.txt | 12 ++++++------ .constraints/py3.8.txt | 22 +++++++++++----------- .constraints/py3.9.txt | 22 +++++++++++----------- .pre-commit-config.yaml | 4 ++-- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 17f8fb3c..d6374e43 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -44,7 +44,7 @@ execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 filelock==3.8.0 -flake8==5.0.4 +flake8==6.0.0 flake8-blind-except==0.2.1 flake8-bugbear==22.10.27 flake8-builtins==2.0.1 @@ -55,7 +55,7 @@ flake8-pytest-style==1.6.0 flake8-rst-docstrings==0.3.0 flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" flake8-use-fstring==1.4 -flatbuffers==22.10.26 +flatbuffers==22.11.23 fonttools==4.38.0 gast==0.4.0 google-auth==2.14.1 @@ -63,14 +63,14 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.1 -grpcio==1.51.0 +grpcio==1.50.0 h5py==3.7.0 hepunits==2.3.0 identify==2.5.9 idna==3.4 imagesize==1.4.1 iminuit==2.17.0 -importlib-metadata==5.0.0 +importlib-metadata==5.1.0 iniconfig==1.1.1 ipykernel==6.17.1 ipympl==0.9.2 @@ -83,7 +83,7 @@ jaxlib==0.3.25 jedi==0.18.2 jinja2==3.1.2 json5==0.9.10 -jsonschema==4.17.0 +jsonschema==4.17.1 jupyter==1.0.0 jupyter-cache==0.5.0 jupyter-client==7.4.7 @@ -131,7 +131,7 @@ numpy==1.23.5 oauthlib==3.2.2 opt-einsum==3.3.0 packaging==21.3 -pandas==1.5.1 +pandas==1.5.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.21.0 @@ -154,12 +154,12 @@ py==1.11.0 py-cpuinfo==9.0.0 pyasn1==0.4.8 pyasn1-modules==0.2.8 -pycodestyle==2.9.1 +pycodestyle==2.10.0 pycparser==2.21 pydantic==1.10.2 pydata-sphinx-theme==0.8.1 pydocstyle==6.1.1 -pyflakes==2.5.0 +pyflakes==3.0.1 pygments==2.13.0 pylint==2.15.6 pyparsing==3.0.9 @@ -212,7 +212,7 @@ tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1 tensorflow==2.11.0 tensorflow-estimator==2.11.0 -tensorflow-io-gcs-filesystem==0.27.0 +tensorflow-io-gcs-filesystem==0.28.0 tensorflow-probability==0.17.0 termcolor==2.1.1 terminado==0.17.0 @@ -228,10 +228,10 @@ types-docutils==0.19.1.1 types-pkg-resources==0.1.3 types-pyyaml==6.0.12.2 types-requests==2.28.11.5 -types-setuptools==65.6.0.0 +types-setuptools==65.6.0.1 types-urllib3==1.26.25.4 typing-extensions==4.4.0 -urllib3==1.26.12 +urllib3==1.26.13 virtualenv==20.16.7 wcwidth==0.2.5 webencodings==0.5.1 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 56a3329c..8b787a4a 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -51,7 +51,7 @@ flake8-plugin-utils==1.3.2 flake8-pytest-style==1.6.0 flake8-rst-docstrings==0.3.0 flake8-use-fstring==1.4 -flatbuffers==22.10.26 +flatbuffers==22.11.23 fonttools==4.38.0 gast==0.4.0 google-auth==2.14.1 @@ -59,7 +59,7 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.1 -grpcio==1.51.0 +grpcio==1.50.0 h5py==3.7.0 hepunits==2.3.0 identify==2.5.9 @@ -80,7 +80,7 @@ jaxlib==0.3.25 jedi==0.18.2 jinja2==3.1.2 json5==0.9.10 -jsonschema==4.17.0 +jsonschema==4.17.1 jupyter==1.0.0 jupyter-cache==0.5.0 jupyter-client==7.4.7 @@ -209,7 +209,7 @@ tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1 tensorflow==2.11.0 tensorflow-estimator==2.11.0 -tensorflow-io-gcs-filesystem==0.27.0 +tensorflow-io-gcs-filesystem==0.28.0 tensorflow-probability==0.17.0 termcolor==2.1.1 terminado==0.17.0 @@ -226,10 +226,10 @@ types-docutils==0.19.1.1 types-pkg-resources==0.1.3 types-pyyaml==6.0.12.2 types-requests==2.28.11.5 -types-setuptools==65.6.0.0 +types-setuptools==65.6.0.1 types-urllib3==1.26.25.4 typing-extensions==4.4.0 -urllib3==1.26.12 +urllib3==1.26.13 virtualenv==20.15.1 ; python_version < "3.8.0" wcwidth==0.2.5 webencodings==0.5.1 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index d760de1a..25ce738f 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -44,7 +44,7 @@ execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 filelock==3.8.0 -flake8==5.0.4 +flake8==6.0.0 flake8-blind-except==0.2.1 flake8-bugbear==22.10.27 flake8-builtins==2.0.1 @@ -55,7 +55,7 @@ flake8-pytest-style==1.6.0 flake8-rst-docstrings==0.3.0 flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" flake8-use-fstring==1.4 -flatbuffers==22.10.26 +flatbuffers==22.11.23 fonttools==4.38.0 gast==0.4.0 google-auth==2.14.1 @@ -63,14 +63,14 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.1 -grpcio==1.51.0 +grpcio==1.50.0 h5py==3.7.0 hepunits==2.3.0 identify==2.5.9 idna==3.4 imagesize==1.4.1 iminuit==2.17.0 -importlib-metadata==5.0.0 +importlib-metadata==5.1.0 importlib-resources==5.10.0 iniconfig==1.1.1 ipykernel==6.17.1 @@ -84,7 +84,7 @@ jaxlib==0.3.25 jedi==0.18.2 jinja2==3.1.2 json5==0.9.10 -jsonschema==4.17.0 +jsonschema==4.17.1 jupyter==1.0.0 jupyter-cache==0.5.0 jupyter-client==7.4.7 @@ -132,7 +132,7 @@ numpy==1.23.5 oauthlib==3.2.2 opt-einsum==3.3.0 packaging==21.3 -pandas==1.5.1 +pandas==1.5.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.21.0 @@ -156,12 +156,12 @@ py==1.11.0 py-cpuinfo==9.0.0 pyasn1==0.4.8 pyasn1-modules==0.2.8 -pycodestyle==2.9.1 +pycodestyle==2.10.0 pycparser==2.21 pydantic==1.10.2 pydata-sphinx-theme==0.8.1 pydocstyle==6.1.1 -pyflakes==2.5.0 +pyflakes==3.0.1 pygments==2.13.0 pylint==2.15.6 pyparsing==3.0.9 @@ -214,7 +214,7 @@ tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1 tensorflow==2.11.0 tensorflow-estimator==2.11.0 -tensorflow-io-gcs-filesystem==0.27.0 +tensorflow-io-gcs-filesystem==0.28.0 tensorflow-probability==0.17.0 termcolor==2.1.1 terminado==0.17.0 @@ -230,10 +230,10 @@ types-docutils==0.19.1.1 types-pkg-resources==0.1.3 types-pyyaml==6.0.12.2 types-requests==2.28.11.5 -types-setuptools==65.6.0.0 +types-setuptools==65.6.0.1 types-urllib3==1.26.25.4 typing-extensions==4.4.0 -urllib3==1.26.12 +urllib3==1.26.13 virtualenv==20.16.7 wcwidth==0.2.5 webencodings==0.5.1 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index c1b18e5c..bdb713e8 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -44,7 +44,7 @@ execnet==1.9.0 executing==1.2.0 fastjsonschema==2.16.2 filelock==3.8.0 -flake8==5.0.4 +flake8==6.0.0 flake8-blind-except==0.2.1 flake8-bugbear==22.10.27 flake8-builtins==2.0.1 @@ -55,7 +55,7 @@ flake8-pytest-style==1.6.0 flake8-rst-docstrings==0.3.0 flake8-type-ignore==0.1.0.post2 ; python_version >= "3.8.0" flake8-use-fstring==1.4 -flatbuffers==22.10.26 +flatbuffers==22.11.23 fonttools==4.38.0 gast==0.4.0 google-auth==2.14.1 @@ -63,14 +63,14 @@ google-auth-oauthlib==0.4.6 google-pasta==0.2.0 graphviz==0.20.1 greenlet==2.0.1 -grpcio==1.51.0 +grpcio==1.50.0 h5py==3.7.0 hepunits==2.3.0 identify==2.5.9 idna==3.4 imagesize==1.4.1 iminuit==2.17.0 -importlib-metadata==5.0.0 +importlib-metadata==5.1.0 iniconfig==1.1.1 ipykernel==6.17.1 ipympl==0.9.2 @@ -83,7 +83,7 @@ jaxlib==0.3.25 jedi==0.18.2 jinja2==3.1.2 json5==0.9.10 -jsonschema==4.17.0 +jsonschema==4.17.1 jupyter==1.0.0 jupyter-cache==0.5.0 jupyter-client==7.4.7 @@ -131,7 +131,7 @@ numpy==1.23.5 oauthlib==3.2.2 opt-einsum==3.3.0 packaging==21.3 -pandas==1.5.1 +pandas==1.5.2 pandocfilters==1.5.0 parso==0.8.3 particle==0.21.0 @@ -154,12 +154,12 @@ py==1.11.0 py-cpuinfo==9.0.0 pyasn1==0.4.8 pyasn1-modules==0.2.8 -pycodestyle==2.9.1 +pycodestyle==2.10.0 pycparser==2.21 pydantic==1.10.2 pydata-sphinx-theme==0.8.1 pydocstyle==6.1.1 -pyflakes==2.5.0 +pyflakes==3.0.1 pygments==2.13.0 pylint==2.15.6 pyparsing==3.0.9 @@ -212,7 +212,7 @@ tensorboard-data-server==0.6.1 tensorboard-plugin-wit==1.8.1 tensorflow==2.11.0 tensorflow-estimator==2.11.0 -tensorflow-io-gcs-filesystem==0.27.0 +tensorflow-io-gcs-filesystem==0.28.0 tensorflow-probability==0.17.0 termcolor==2.1.1 terminado==0.17.0 @@ -228,10 +228,10 @@ types-docutils==0.19.1.1 types-pkg-resources==0.1.3 types-pyyaml==6.0.12.2 types-requests==2.28.11.5 -types-setuptools==65.6.0.0 +types-setuptools==65.6.0.1 types-urllib3==1.26.25.4 typing-extensions==4.4.0 -urllib3==1.26.12 +urllib3==1.26.13 virtualenv==20.16.7 wcwidth==0.2.5 webencodings==0.5.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e7af57f6..c94a2698 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: check-useless-excludes - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-ast - id: check-case-conflict @@ -180,7 +180,7 @@ repos: - python - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.280 + rev: v1.1.281 hooks: - id: pyright