From ee001e7ba8a7d3a97220a9bb156fbfe064c02a10 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 7 Sep 2023 03:14:23 +0000 Subject: [PATCH 01/11] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 143 +++++++++++++++++++-------------------- .constraints/py3.11.txt | 141 +++++++++++++++++++------------------- .constraints/py3.6.txt | 27 ++++---- .constraints/py3.7.txt | 57 ++++++++-------- .constraints/py3.8.txt | 129 +++++++++++++++++------------------ .constraints/py3.9.txt | 145 ++++++++++++++++++++-------------------- .pre-commit-config.yaml | 18 ++--- 7 files changed, 333 insertions(+), 327 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index ce11638..e3cd8b5 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -2,84 +2,85 @@ # This file is autogenerated by pip-compile with Python 3.10 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --resolver=backtracking --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.10.txt --strip-extras # accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 -anyio==3.7.1 +anyio==4.0.0 aquirdturtle-collapsible-headings==3.1.0 -argon2-cffi==21.3.0 +argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 -asttokens==2.2.1 +asttokens==2.4.0 attrs==23.1.0 -awkward==2.3.1 -awkward-cpp==21 +awkward==2.4.2 +awkward-cpp==23 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.3.0 +black==23.7.0 bleach==6.0.0 cachetools==5.3.1 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -cfgv==3.3.1 -chardet==5.1.0 +cfgv==3.4.0 +chardet==5.2.0 charset-normalizer==3.2.0 -click==8.1.4 +click==8.1.7 colorama==0.4.6 -comm==0.1.3 +comm==0.1.4 contourpy==1.1.0 -coverage==7.2.7 +coverage==7.3.1 cycler==0.11.0 -debugpy==1.6.7 +debugpy==1.6.7.post1 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.6 +distlib==0.3.7 docutils==0.19 -exceptiongroup==1.1.2 +entrypoints==0.4 +exceptiongroup==1.1.3 execnet==2.0.2 executing==1.2.0 -fastjsonschema==2.17.1 -filelock==3.12.2 -fonttools==4.40.0 +fastjsonschema==2.18.0 +filelock==3.12.3 +fonttools==4.42.1 fqdn==1.5.1 gprof2dot==2022.7.29 greenlet==2.0.2 -identify==2.5.24 +identify==2.5.27 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 iniconfig==2.0.0 -ipykernel==6.24.0 -ipython==8.14.0 +ipykernel==6.25.2 +ipython==8.15.0 ipython-genutils==0.2.0 -ipywidgets==8.0.7 +ipywidgets==8.1.0 isoduration==20.11.0 -jedi==0.18.2 +jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.18.0 -jsonschema-specifications==2023.6.1 +jsonschema==4.19.0 +jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 -jupyter-client==8.3.0 +jupyter-client==7.4.9 jupyter-core==5.3.1 -jupyter-events==0.6.3 -jupyter-server==2.7.0 +jupyter-events==0.7.0 +jupyter-server==2.7.3 jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 -jupyterlab-myst==2.0.1 ; python_version >= "3.7.0" +jupyterlab-myst==2.0.2 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 -jupyterlab-server==2.23.0 +jupyterlab-server==2.24.0 jupyterlab-widgets==3.0.8 -kiwisolver==1.4.4 +kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 @@ -88,62 +89,62 @@ matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 mistune==3.0.1 -mypy==1.4.1 +mypy==1.5.1 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclassic==1.0.0 nbclient==0.7.4 -nbconvert==7.6.0 -nbformat==5.9.1 -nest-asyncio==1.5.6 +nbconvert==7.8.0 +nbformat==5.9.2 +nest-asyncio==1.5.7 nodeenv==1.8.0 -notebook==6.5.4 +notebook==6.5.5 notebook-shim==0.2.3 -numpy==1.25.1 -overrides==7.3.1 +numpy==1.25.2 +overrides==7.4.0 packaging==23.1 -pandas==2.0.3 +pandas==2.1.0 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.1 +pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 pillow==10.0.0 -platformdirs==3.8.1 -pluggy==1.2.0 -pre-commit==3.3.3 -prometheus-client==0.17.0 +platformdirs==3.10.0 +pluggy==1.3.0 +pre-commit==3.4.0 +prometheus-client==0.17.1 prompt-toolkit==3.0.39 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 pycparser==2.21 pydata-sphinx-theme==0.13.3 -pydeps==1.12.8 -pygments==2.15.1 +pydeps==1.12.17 +pygments==2.16.1 pyparsing==3.0.9 -pyproject-api==1.5.3 -pytest==7.4.0 +pyproject-api==1.6.1 +pytest==7.4.1 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 -pytz==2023.3 -pyyaml==6.0 -pyzmq==25.1.0 -referencing==0.29.1 +pytz==2023.3.post1 +pyyaml==6.0.1 +pyzmq==24.0.1 +referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rpds-py==0.8.10 -ruff==0.0.277 ; python_version >= "3.7.0" +rpds-py==0.10.2 +ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 snowballstemmer==2.2.0 -soupsieve==2.4.1 +soupsieve==2.5 sphinx==5.3.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==1.0.1 @@ -151,38 +152,38 @@ sphinx-codeautolink==0.15.0 sphinx-copybutton==0.5.2 sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 -sphinxcontrib-applehelp==1.0.4 -sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-applehelp==1.0.7 +sphinxcontrib-devhelp==1.0.5 +sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.3 -sphinxcontrib-serializinghtml==1.1.5 -sqlalchemy==2.0.18 +sphinxcontrib-qthelp==1.0.6 +sphinxcontrib-serializinghtml==1.1.9 +sqlalchemy==2.0.20 stack-data==0.6.2 stdlib-list==0.9.0 tabulate==0.9.0 terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 -tornado==6.3.2 -tox==4.6.4 +tornado==6.3.3 +tox==4.11.1 traitlets==5.9.0 -types-setuptools==68.0.0.1 +types-setuptools==68.1.0.1 typing-extensions==4.7.1 tzdata==2023.3 -uproot==5.0.10 +uproot==5.0.11 uri-template==1.3.0 -urllib3==2.0.3 -virtualenv==20.23.1 +urllib3==2.0.4 +virtualenv==20.24.4 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.1 -wheel==0.40.0 +websocket-client==1.6.2 +wheel==0.41.2 widgetsnbextension==4.0.8 y-py==0.5.9 ypy-websocket==0.8.2 ; python_version >= "3.7.0" -zipp==3.16.0 +zipp==3.16.2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index ddd1cd4..ef42739 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -2,83 +2,84 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --resolver=backtracking --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.11.txt --strip-extras # accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 -anyio==3.7.1 +anyio==4.0.0 aquirdturtle-collapsible-headings==3.1.0 -argon2-cffi==21.3.0 +argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 -asttokens==2.2.1 +asttokens==2.4.0 attrs==23.1.0 -awkward==2.3.1 -awkward-cpp==21 +awkward==2.4.2 +awkward-cpp==23 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.3.0 +black==23.7.0 bleach==6.0.0 cachetools==5.3.1 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -cfgv==3.3.1 -chardet==5.1.0 +cfgv==3.4.0 +chardet==5.2.0 charset-normalizer==3.2.0 -click==8.1.4 +click==8.1.7 colorama==0.4.6 -comm==0.1.3 +comm==0.1.4 contourpy==1.1.0 -coverage==7.2.7 +coverage==7.3.1 cycler==0.11.0 -debugpy==1.6.7 +debugpy==1.6.7.post1 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.6 +distlib==0.3.7 docutils==0.19 +entrypoints==0.4 execnet==2.0.2 executing==1.2.0 -fastjsonschema==2.17.1 -filelock==3.12.2 -fonttools==4.40.0 +fastjsonschema==2.18.0 +filelock==3.12.3 +fonttools==4.42.1 fqdn==1.5.1 gprof2dot==2022.7.29 greenlet==2.0.2 -identify==2.5.24 +identify==2.5.27 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 iniconfig==2.0.0 -ipykernel==6.24.0 -ipython==8.14.0 +ipykernel==6.25.2 +ipython==8.15.0 ipython-genutils==0.2.0 -ipywidgets==8.0.7 +ipywidgets==8.1.0 isoduration==20.11.0 -jedi==0.18.2 +jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.18.0 -jsonschema-specifications==2023.6.1 +jsonschema==4.19.0 +jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 -jupyter-client==8.3.0 +jupyter-client==7.4.9 jupyter-core==5.3.1 -jupyter-events==0.6.3 -jupyter-server==2.7.0 +jupyter-events==0.7.0 +jupyter-server==2.7.3 jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 -jupyterlab-myst==2.0.1 ; python_version >= "3.7.0" +jupyterlab-myst==2.0.2 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 -jupyterlab-server==2.23.0 +jupyterlab-server==2.24.0 jupyterlab-widgets==3.0.8 -kiwisolver==1.4.4 +kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 @@ -87,62 +88,62 @@ matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 mistune==3.0.1 -mypy==1.4.1 +mypy==1.5.1 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclassic==1.0.0 nbclient==0.7.4 -nbconvert==7.6.0 -nbformat==5.9.1 -nest-asyncio==1.5.6 +nbconvert==7.8.0 +nbformat==5.9.2 +nest-asyncio==1.5.7 nodeenv==1.8.0 -notebook==6.5.4 +notebook==6.5.5 notebook-shim==0.2.3 -numpy==1.25.1 -overrides==7.3.1 +numpy==1.25.2 +overrides==7.4.0 packaging==23.1 -pandas==2.0.3 +pandas==2.1.0 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.1 +pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 pillow==10.0.0 -platformdirs==3.8.1 -pluggy==1.2.0 -pre-commit==3.3.3 -prometheus-client==0.17.0 +platformdirs==3.10.0 +pluggy==1.3.0 +pre-commit==3.4.0 +prometheus-client==0.17.1 prompt-toolkit==3.0.39 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 pycparser==2.21 pydata-sphinx-theme==0.13.3 -pydeps==1.12.8 -pygments==2.15.1 +pydeps==1.12.17 +pygments==2.16.1 pyparsing==3.0.9 -pyproject-api==1.5.3 -pytest==7.4.0 +pyproject-api==1.6.1 +pytest==7.4.1 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 -pytz==2023.3 -pyyaml==6.0 -pyzmq==25.1.0 -referencing==0.29.1 +pytz==2023.3.post1 +pyyaml==6.0.1 +pyzmq==24.0.1 +referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rpds-py==0.8.10 -ruff==0.0.277 ; python_version >= "3.7.0" +rpds-py==0.10.2 +ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 snowballstemmer==2.2.0 -soupsieve==2.4.1 +soupsieve==2.5 sphinx==5.3.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==1.0.1 @@ -150,37 +151,37 @@ sphinx-codeautolink==0.15.0 sphinx-copybutton==0.5.2 sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 -sphinxcontrib-applehelp==1.0.4 -sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-applehelp==1.0.7 +sphinxcontrib-devhelp==1.0.5 +sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.3 -sphinxcontrib-serializinghtml==1.1.5 -sqlalchemy==2.0.18 +sphinxcontrib-qthelp==1.0.6 +sphinxcontrib-serializinghtml==1.1.9 +sqlalchemy==2.0.20 stack-data==0.6.2 stdlib-list==0.9.0 tabulate==0.9.0 terminado==0.17.1 tinycss2==1.2.1 -tornado==6.3.2 -tox==4.6.4 +tornado==6.3.3 +tox==4.11.1 traitlets==5.9.0 -types-setuptools==68.0.0.1 +types-setuptools==68.1.0.1 typing-extensions==4.7.1 tzdata==2023.3 -uproot==5.0.10 +uproot==5.0.11 uri-template==1.3.0 -urllib3==2.0.3 -virtualenv==20.23.1 +urllib3==2.0.4 +virtualenv==20.24.4 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.1 -wheel==0.40.0 +websocket-client==1.6.2 +wheel==0.41.2 widgetsnbextension==4.0.8 y-py==0.5.9 ypy-websocket==0.8.2 ; python_version >= "3.7.0" -zipp==3.16.0 +zipp==3.16.2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.constraints/py3.6.txt b/.constraints/py3.6.txt index e974c4e..d31197d 100644 --- a/.constraints/py3.6.txt +++ b/.constraints/py3.6.txt @@ -17,19 +17,20 @@ backcall==0.2.0 beautifulsoup4==4.12.2 black==22.8.0 bleach==4.1.0 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 cfgv==3.3.1 charset-normalizer==2.0.12 click==8.0.4 colorama==0.4.5 +comm==0.1.4 contextvars==2.4 coverage==6.2 cycler==0.11.0 dataclasses==0.8 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.6 +distlib==0.3.7 docutils==0.16 entrypoints==0.4 execnet==1.9.0 @@ -48,7 +49,7 @@ iniconfig==1.1.1 ipykernel==5.5.6 ipython==7.16.3 ipython-genutils==0.2.0 -ipywidgets==7.7.5 +ipywidgets==7.8.0 jedi==0.17.2 jinja2==3.0.3 json5==0.9.14 @@ -63,7 +64,7 @@ jupyterlab==3.2.9 jupyterlab-code-formatter==1.6.1 jupyterlab-pygments==0.1.2 jupyterlab-server==2.10.3 -jupyterlab-widgets==1.1.4 +jupyterlab-widgets==1.1.5 kiwisolver==1.3.1 livereload==2.6.3 markdown-it-py==1.1.0 @@ -80,7 +81,7 @@ nbclient==0.5.9 nbconvert==6.0.7 nbdime==3.2.1 nbformat==5.1.3 -nest-asyncio==1.5.6 +nest-asyncio==1.5.7 nodeenv==1.6.0 notebook==6.4.10 numpy==1.19.5 @@ -95,24 +96,24 @@ pillow==8.4.0 platformdirs==2.4.0 pluggy==1.0.0 pre-commit==2.17.0 -prometheus-client==0.17.0 +prometheus-client==0.17.1 prompt-toolkit==3.0.36 ptyprocess==0.7.0 py==1.11.0 pycparser==2.21 pydata-sphinx-theme==0.7.2 -pydeps==1.12.8 +pydeps==1.12.17 pygments==2.14.0 -pyparsing==3.1.0 +pyparsing==3.1.1 pyrsistent==0.18.0 pytest==7.0.1 pytest-cov==4.0.0 pytest-profiling==1.7.0 pytest-xdist==3.0.2 python-dateutil==2.8.2 -pytz==2023.3 -pyyaml==6.0 -pyzmq==25.1.0 +pytz==2023.3.post1 +pyyaml==6.0.1 +pyzmq==25.1.1 requests==2.27.1 send2trash==1.8.2 six==1.16.0 @@ -143,7 +144,7 @@ tornado==6.1 tox==3.28.0 ; python_version < "3.8.0" traitlets==4.3.3 typed-ast==1.5.5 -types-setuptools==68.0.0.1 +types-setuptools==68.1.0.1 typing-extensions==4.1.1 uproot==4.3.7 urllib3==1.26.16 @@ -152,7 +153,7 @@ wcwidth==0.2.6 webencodings==0.5.1 websocket-client==1.3.1 wheel==0.37.1 -widgetsnbextension==3.6.4 +widgetsnbextension==3.6.5 zipp==3.6.0 # The following packages are considered to be unsafe in a requirements file: diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index d36346b..9b29287 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -10,7 +10,7 @@ aiosqlite==0.19.0 alabaster==0.7.13 anyio==3.7.1 aquirdturtle-collapsible-headings==3.1.0 -argon2-cffi==21.3.0 +argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 attrs==23.1.0 @@ -22,23 +22,24 @@ beautifulsoup4==4.12.2 black==23.3.0 bleach==6.0.0 cached-property==1.5.2 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 cfgv==3.3.1 charset-normalizer==3.2.0 -click==8.1.4 +click==8.1.7 colorama==0.4.6 +comm==0.1.4 coverage==7.2.7 cycler==0.11.0 -debugpy==1.6.7 +debugpy==1.6.7.post1 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.6 +distlib==0.3.7 docutils==0.17.1 entrypoints==0.4 -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 execnet==2.0.2 -fastjsonschema==2.17.1 +fastjsonschema==2.18.0 filelock==3.12.2 fonttools==4.38.0 fqdn==1.5.1 @@ -53,9 +54,9 @@ iniconfig==2.0.0 ipykernel==6.16.2 ipython==7.34.0 ipython-genutils==0.2.0 -ipywidgets==8.0.7 +ipywidgets==8.1.0 isoduration==20.11.0 -jedi==0.18.2 +jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -72,9 +73,9 @@ jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 jupyterlab-myst==1.2.0 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 -jupyterlab-server==2.23.0 +jupyterlab-server==2.24.0 jupyterlab-widgets==3.0.8 -kiwisolver==1.4.4 +kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 @@ -91,47 +92,47 @@ nbclassic==1.0.0 nbclient==0.5.13 nbconvert==7.6.0 nbformat==5.8.0 -nest-asyncio==1.5.6 +nest-asyncio==1.5.7 nodeenv==1.8.0 -notebook==6.5.4 +notebook==6.5.5 notebook-shim==0.2.3 numpy==1.21.6 packaging==23.1 pandas==1.3.5 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.1 +pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 pillow==9.5.0 pkgutil-resolve-name==1.3.10 -platformdirs==3.8.1 +platformdirs==3.10.0 pluggy==1.2.0 pre-commit==2.21.0 -prometheus-client==0.17.0 +prometheus-client==0.17.1 prompt-toolkit==3.0.39 psutil==5.9.5 ptyprocess==0.7.0 py==1.11.0 pycparser==2.21 pydata-sphinx-theme==0.13.3 -pydeps==1.12.8 -pygments==2.15.1 -pyparsing==3.1.0 +pydeps==1.12.17 +pygments==2.16.1 +pyparsing==3.1.1 pyrsistent==0.19.3 -pytest==7.4.0 +pytest==7.4.1 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 -pytz==2023.3 -pyyaml==6.0 -pyzmq==25.1.0 +pytz==2023.3.post1 +pyyaml==6.0.1 +pyzmq==24.0.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -ruff==0.0.277 ; python_version >= "3.7.0" +ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 @@ -160,17 +161,17 @@ tornado==6.2 tox==3.28.0 ; python_version < "3.8.0" traitlets==5.9.0 typed-ast==1.5.5 -types-setuptools==68.0.0.1 +types-setuptools==68.1.0.1 typing-extensions==4.7.1 -uproot==5.0.10 +uproot==5.0.11 uri-template==1.3.0 -urllib3==2.0.3 +urllib3==2.0.4 virtualenv==20.21.1 ; python_version < "3.8.0" wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 websocket-client==1.6.1 -wheel==0.40.0 +wheel==0.41.2 widgetsnbextension==4.0.8 y-py==0.5.9 ypy-websocket==0.8.2 ; python_version >= "3.7.0" diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 262ec7d..2baf945 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -2,85 +2,86 @@ # This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --resolver=backtracking --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.8.txt --strip-extras # accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 -anyio==3.7.1 +anyio==4.0.0 aquirdturtle-collapsible-headings==3.1.0 -argon2-cffi==21.3.0 +argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 -asttokens==2.2.1 +asttokens==2.4.0 attrs==23.1.0 -awkward==2.3.1 -awkward-cpp==21 +awkward==2.4.2 +awkward-cpp==23 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.3.0 +black==23.7.0 bleach==6.0.0 cachetools==5.3.1 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -cfgv==3.3.1 -chardet==5.1.0 +cfgv==3.4.0 +chardet==5.2.0 charset-normalizer==3.2.0 -click==8.1.4 +click==8.1.7 colorama==0.4.6 -comm==0.1.3 +comm==0.1.4 contourpy==1.1.0 -coverage==7.2.7 +coverage==7.3.1 cycler==0.11.0 -debugpy==1.6.7 +debugpy==1.6.7.post1 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.6 +distlib==0.3.7 docutils==0.19 -exceptiongroup==1.1.2 +entrypoints==0.4 +exceptiongroup==1.1.3 execnet==2.0.2 executing==1.2.0 -fastjsonschema==2.17.1 -filelock==3.12.2 -fonttools==4.40.0 +fastjsonschema==2.18.0 +filelock==3.12.3 +fonttools==4.42.1 fqdn==1.5.1 gprof2dot==2022.7.29 greenlet==2.0.2 -identify==2.5.24 +identify==2.5.27 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 -importlib-resources==6.0.0 +importlib-resources==6.0.1 iniconfig==2.0.0 -ipykernel==6.24.0 +ipykernel==6.25.2 ipython==8.12.2 ipython-genutils==0.2.0 -ipywidgets==8.0.7 +ipywidgets==8.1.0 isoduration==20.11.0 -jedi==0.18.2 +jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.18.0 -jsonschema-specifications==2023.6.1 +jsonschema==4.19.0 +jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 -jupyter-client==8.3.0 +jupyter-client==7.4.9 jupyter-core==5.3.1 -jupyter-events==0.6.3 -jupyter-server==2.7.0 +jupyter-events==0.7.0 +jupyter-server==2.7.3 jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 -jupyterlab-myst==2.0.1 ; python_version >= "3.7.0" +jupyterlab-myst==2.0.2 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 -jupyterlab-server==2.23.0 +jupyterlab-server==2.24.0 jupyterlab-widgets==3.0.8 -kiwisolver==1.4.4 +kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 @@ -89,63 +90,63 @@ matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 mistune==3.0.1 -mypy==1.4.1 +mypy==1.5.1 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclassic==1.0.0 nbclient==0.7.4 -nbconvert==7.6.0 -nbformat==5.9.1 -nest-asyncio==1.5.6 +nbconvert==7.8.0 +nbformat==5.9.2 +nest-asyncio==1.5.7 nodeenv==1.8.0 -notebook==6.5.4 +notebook==6.5.5 notebook-shim==0.2.3 numpy==1.24.4 -overrides==7.3.1 +overrides==7.4.0 packaging==23.1 pandas==2.0.3 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.1 +pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 pillow==10.0.0 pkgutil-resolve-name==1.3.10 -platformdirs==3.8.1 -pluggy==1.2.0 -pre-commit==3.3.3 -prometheus-client==0.17.0 +platformdirs==3.10.0 +pluggy==1.3.0 +pre-commit==3.4.0 +prometheus-client==0.17.1 prompt-toolkit==3.0.39 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 pycparser==2.21 pydata-sphinx-theme==0.13.3 -pydeps==1.12.8 -pygments==2.15.1 +pydeps==1.12.17 +pygments==2.16.1 pyparsing==3.0.9 -pyproject-api==1.5.3 -pytest==7.4.0 +pyproject-api==1.6.1 +pytest==7.4.1 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 -pytz==2023.3 -pyyaml==6.0 -pyzmq==25.1.0 -referencing==0.29.1 +pytz==2023.3.post1 +pyyaml==6.0.1 +pyzmq==24.0.1 +referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rpds-py==0.8.10 -ruff==0.0.277 ; python_version >= "3.7.0" +rpds-py==0.10.2 +ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 snowballstemmer==2.2.0 -soupsieve==2.4.1 +soupsieve==2.5 sphinx==5.3.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==1.0.1 @@ -159,32 +160,32 @@ sphinxcontrib-htmlhelp==2.0.1 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 -sqlalchemy==2.0.18 +sqlalchemy==2.0.20 stack-data==0.6.2 stdlib-list==0.9.0 tabulate==0.9.0 terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 -tornado==6.3.2 -tox==4.6.4 +tornado==6.3.3 +tox==4.11.1 traitlets==5.9.0 -types-setuptools==68.0.0.1 +types-setuptools==68.1.0.1 typing-extensions==4.7.1 tzdata==2023.3 -uproot==5.0.10 +uproot==5.0.11 uri-template==1.3.0 -urllib3==2.0.3 -virtualenv==20.23.1 +urllib3==2.0.4 +virtualenv==20.24.4 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.1 -wheel==0.40.0 +websocket-client==1.6.2 +wheel==0.41.2 widgetsnbextension==4.0.8 y-py==0.5.9 ypy-websocket==0.8.2 ; python_version >= "3.7.0" -zipp==3.16.0 +zipp==3.16.2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 90d75ac..7080e64 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -2,85 +2,86 @@ # This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --resolver=backtracking --strip-extras +# pip-compile --extra=dev --no-annotate --output-file=.constraints/py3.9.txt --strip-extras # accessible-pygments==0.0.4 aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 -anyio==3.7.1 +anyio==4.0.0 aquirdturtle-collapsible-headings==3.1.0 -argon2-cffi==21.3.0 +argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 -asttokens==2.2.1 +asttokens==2.4.0 attrs==23.1.0 -awkward==2.3.1 -awkward-cpp==21 +awkward==2.4.2 +awkward-cpp==23 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.3.0 +black==23.7.0 bleach==6.0.0 cachetools==5.3.1 -certifi==2023.5.7 +certifi==2023.7.22 cffi==1.15.1 -cfgv==3.3.1 -chardet==5.1.0 +cfgv==3.4.0 +chardet==5.2.0 charset-normalizer==3.2.0 -click==8.1.4 +click==8.1.7 colorama==0.4.6 -comm==0.1.3 +comm==0.1.4 contourpy==1.1.0 -coverage==7.2.7 +coverage==7.3.1 cycler==0.11.0 -debugpy==1.6.7 +debugpy==1.6.7.post1 decorator==5.1.1 defusedxml==0.7.1 -distlib==0.3.6 +distlib==0.3.7 docutils==0.19 -exceptiongroup==1.1.2 +entrypoints==0.4 +exceptiongroup==1.1.3 execnet==2.0.2 executing==1.2.0 -fastjsonschema==2.17.1 -filelock==3.12.2 -fonttools==4.40.0 +fastjsonschema==2.18.0 +filelock==3.12.3 +fonttools==4.42.1 fqdn==1.5.1 gprof2dot==2022.7.29 greenlet==2.0.2 -identify==2.5.24 +identify==2.5.27 idna==3.4 imagesize==1.4.1 importlib-metadata==6.8.0 -importlib-resources==6.0.0 +importlib-resources==6.0.1 iniconfig==2.0.0 -ipykernel==6.24.0 -ipython==8.14.0 +ipykernel==6.25.2 +ipython==8.15.0 ipython-genutils==0.2.0 -ipywidgets==8.0.7 +ipywidgets==8.1.0 isoduration==20.11.0 -jedi==0.18.2 +jedi==0.19.0 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 -jsonschema==4.18.0 -jsonschema-specifications==2023.6.1 +jsonschema==4.19.0 +jsonschema-specifications==2023.7.1 jupyter-cache==0.6.1 -jupyter-client==8.3.0 +jupyter-client==7.4.9 jupyter-core==5.3.1 -jupyter-events==0.6.3 -jupyter-server==2.7.0 +jupyter-events==0.7.0 +jupyter-server==2.7.3 jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 -jupyterlab-myst==2.0.1 ; python_version >= "3.7.0" +jupyterlab-myst==2.0.2 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 -jupyterlab-server==2.23.0 +jupyterlab-server==2.24.0 jupyterlab-widgets==3.0.8 -kiwisolver==1.4.4 +kiwisolver==1.4.5 livereload==2.6.3 markdown-it-py==2.2.0 markupsafe==2.1.3 @@ -89,62 +90,62 @@ matplotlib-inline==0.1.6 mdit-py-plugins==0.3.5 mdurl==0.1.2 mistune==3.0.1 -mypy==1.4.1 +mypy==1.5.1 mypy-extensions==1.0.0 myst-nb==0.17.2 myst-parser==0.18.1 nbclassic==1.0.0 nbclient==0.7.4 -nbconvert==7.6.0 -nbformat==5.9.1 -nest-asyncio==1.5.6 +nbconvert==7.8.0 +nbformat==5.9.2 +nest-asyncio==1.5.7 nodeenv==1.8.0 -notebook==6.5.4 +notebook==6.5.5 notebook-shim==0.2.3 -numpy==1.25.1 -overrides==7.3.1 +numpy==1.25.2 +overrides==7.4.0 packaging==23.1 -pandas==2.0.3 +pandas==2.1.0 pandocfilters==1.5.0 parso==0.8.3 -pathspec==0.11.1 +pathspec==0.11.2 pexpect==4.8.0 pickleshare==0.7.5 pillow==10.0.0 -platformdirs==3.8.1 -pluggy==1.2.0 -pre-commit==3.3.3 -prometheus-client==0.17.0 +platformdirs==3.10.0 +pluggy==1.3.0 +pre-commit==3.4.0 +prometheus-client==0.17.1 prompt-toolkit==3.0.39 psutil==5.9.5 ptyprocess==0.7.0 pure-eval==0.2.2 pycparser==2.21 pydata-sphinx-theme==0.13.3 -pydeps==1.12.8 -pygments==2.15.1 +pydeps==1.12.17 +pygments==2.16.1 pyparsing==3.0.9 -pyproject-api==1.5.3 -pytest==7.4.0 +pyproject-api==1.6.1 +pytest==7.4.1 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 -pytz==2023.3 -pyyaml==6.0 -pyzmq==25.1.0 -referencing==0.29.1 +pytz==2023.3.post1 +pyyaml==6.0.1 +pyzmq==24.0.1 +referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 -rpds-py==0.8.10 -ruff==0.0.277 ; python_version >= "3.7.0" +rpds-py==0.10.2 +ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 six==1.16.0 sniffio==1.3.0 snowballstemmer==2.2.0 -soupsieve==2.4.1 +soupsieve==2.5 sphinx==5.3.0 sphinx-autobuild==2021.3.14 sphinx-book-theme==1.0.1 @@ -152,38 +153,38 @@ sphinx-codeautolink==0.15.0 sphinx-copybutton==0.5.2 sphinx-thebe==0.2.1 sphinx-togglebutton==0.3.2 -sphinxcontrib-applehelp==1.0.4 -sphinxcontrib-devhelp==1.0.2 -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-applehelp==1.0.7 +sphinxcontrib-devhelp==1.0.5 +sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 -sphinxcontrib-qthelp==1.0.3 -sphinxcontrib-serializinghtml==1.1.5 -sqlalchemy==2.0.18 +sphinxcontrib-qthelp==1.0.6 +sphinxcontrib-serializinghtml==1.1.9 +sqlalchemy==2.0.20 stack-data==0.6.2 stdlib-list==0.9.0 tabulate==0.9.0 terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 -tornado==6.3.2 -tox==4.6.4 +tornado==6.3.3 +tox==4.11.1 traitlets==5.9.0 -types-setuptools==68.0.0.1 +types-setuptools==68.1.0.1 typing-extensions==4.7.1 tzdata==2023.3 -uproot==5.0.10 +uproot==5.0.11 uri-template==1.3.0 -urllib3==2.0.3 -virtualenv==20.23.1 +urllib3==2.0.4 +virtualenv==20.24.4 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 -websocket-client==1.6.1 -wheel==0.40.0 +websocket-client==1.6.2 +wheel==0.41.2 widgetsnbextension==4.0.8 y-py==0.5.9 ypy-websocket==0.8.2 ; python_version >= "3.7.0" -zipp==3.16.0 +zipp==3.16.2 # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 30a6141..b6ed634 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.192 + rev: 0.0.197 hooks: - id: check-dev-files args: @@ -41,12 +41,12 @@ repos: - id: format-setup-cfg - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 23.7.0 hooks: - id: black - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v6.31.0 + rev: v7.3.0 hooks: - id: cspell @@ -62,7 +62,7 @@ repos: )$ - repo: https://github.com/igorshubovych/markdownlint-cli - rev: v0.35.0 + rev: v0.36.0 hooks: - id: markdownlint @@ -101,30 +101,30 @@ repos: metadata.vscode - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.0 + rev: v3.0.3 hooks: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.316 + rev: v1.1.326 hooks: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v3.9.0 + rev: v3.10.1 hooks: - id: pyupgrade args: - --py36-plus - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.0.277 + rev: v0.0.287 hooks: - id: ruff args: - --fix - repo: https://github.com/ComPWA/mirrors-taplo - rev: v0.8.0 + rev: v0.8.1 hooks: - id: taplo From b054818ca47b1100eb86b0d307fa7f2cc3b20844 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 03:14:35 +0000 Subject: [PATCH 02/11] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .cspell.json | 2 +- .gitpod.yml | 1 + .vscode/extensions.json | 1 + .vscode/settings.json | 14 ++++---------- tests/boostcfg/test_boostcfg.py | 6 +++--- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.cspell.json b/.cspell.json index 0fec695..ed7a4b8 100644 --- a/.cspell.json +++ b/.cspell.json @@ -30,7 +30,7 @@ ".readthedocs.yml", ".vscode/*", ".vscode/.gitignore", - ".zenodo.json", + "CITATION.cff", "codecov.yml", "Dockerfile", "docs/_templates/*", diff --git a/.gitpod.yml b/.gitpod.yml index ebd2be8..f159979 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -23,6 +23,7 @@ vscode: - garaioag.garaio-vscode-unwanted-recommendations - github.vscode-github-actions - github.vscode-pull-request-github + - ms-python.black-formatter - ms-python.mypy-type-checker - ms-python.python - ms-python.vscode-pylance diff --git a/.vscode/extensions.json b/.vscode/extensions.json index cd674ed..837c581 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -10,6 +10,7 @@ "garaioag.garaio-vscode-unwanted-recommendations", "github.vscode-github-actions", "github.vscode-pull-request-github", + "ms-python.black-formatter", "ms-python.mypy-type-checker", "ms-python.python", "ms-python.vscode-pylance", diff --git a/.vscode/settings.json b/.vscode/settings.json index b9966bc..bb62e7e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,16 +18,18 @@ "[python]": { "editor.codeActionsOnSave": { "source.organizeImports": true - } + }, + "editor.defaultFormatter": "ms-python.black-formatter" }, "[yaml]": { "editor.defaultFormatter": "esbenp.prettier-vscode" }, + "black-formatter.importStrategy": "fromEnvironment", + "cSpell.enabled": true, "coverage-gutters.coverageFileNames": ["coverage.xml"], "coverage-gutters.coverageReportFileName": "**/htmlcov/index.html", "coverage-gutters.showGutterCoverage": false, "coverage-gutters.showLineCoverage": true, - "cSpell.enabled": true, "editor.formatOnSave": true, "editor.rulers": [88], "git.rebaseWhenSync": true, @@ -39,15 +41,7 @@ "python.analysis.autoImportCompletions": false, "python.analysis.inlayHints.pytestParameters": true, "python.analysis.typeCheckingMode": "strict", - "python.formatting.provider": "black", "python.languageServer": "Pylance", - "python.linting.banditEnabled": false, - "python.linting.enabled": true, - "python.linting.flake8Enabled": false, - "python.linting.mypyEnabled": false, - "python.linting.pydocstyleEnabled": false, - "python.linting.pylamaEnabled": false, - "python.linting.pylintEnabled": false, "python.testing.pytestArgs": ["--color=no", "--no-cov"], "python.testing.pytestEnabled": true, "python.testing.unittestEnabled": false, diff --git a/tests/boostcfg/test_boostcfg.py b/tests/boostcfg/test_boostcfg.py index 2af5618..2138657 100644 --- a/tests/boostcfg/test_boostcfg.py +++ b/tests/boostcfg/test_boostcfg.py @@ -14,7 +14,7 @@ def test_append_value_from_line(): cfg.append_value_from_line("false_bool = False") cfg.append_value_from_line("true_bool = true") assert cfg["key"] == "value" - assert cfg["float"] == float(3.14) + assert cfg["float"] == 3.14 assert cfg["int"] == int(-11) assert not cfg["false_bool"] assert cfg["true_bool"] @@ -28,8 +28,8 @@ def test_append_value_from_line(): def test_boostcfg_init(): cfg = BoostConfigParser(FILENAME) assert cfg["errLogMode"] == "trace" - assert cfg["noOfDataEvents"] == int(7860) - assert cfg["cmsMass"] == float(4.18) + assert cfg["noOfDataEvents"] == 7860 + assert cfg["cmsMass"] == 4.18 assert cfg["name"] == "_epem" assert cfg["verbose"] assert cfg["histMass"] == ["pion+ D0", "pion+ D-", "D0 D-"] From 9f736c7f04ad82d52d1d844009275fb3480ea479 Mon Sep 17 00:00:00 2001 From: GitHub Date: Thu, 7 Sep 2023 03:16:22 +0000 Subject: [PATCH 03/11] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 2 +- .constraints/py3.11.txt | 2 +- .constraints/py3.6.txt | 2 +- .constraints/py3.7.txt | 2 +- .constraints/py3.8.txt | 2 +- .constraints/py3.9.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index e3cd8b5..3fecd85 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -168,7 +168,7 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.1 traitlets==5.9.0 -types-setuptools==68.1.0.1 +types-setuptools==68.2.0.0 typing-extensions==4.7.1 tzdata==2023.3 uproot==5.0.11 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index ef42739..15d9199 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -166,7 +166,7 @@ tinycss2==1.2.1 tornado==6.3.3 tox==4.11.1 traitlets==5.9.0 -types-setuptools==68.1.0.1 +types-setuptools==68.2.0.0 typing-extensions==4.7.1 tzdata==2023.3 uproot==5.0.11 diff --git a/.constraints/py3.6.txt b/.constraints/py3.6.txt index d31197d..96ccf20 100644 --- a/.constraints/py3.6.txt +++ b/.constraints/py3.6.txt @@ -144,7 +144,7 @@ tornado==6.1 tox==3.28.0 ; python_version < "3.8.0" traitlets==4.3.3 typed-ast==1.5.5 -types-setuptools==68.1.0.1 +types-setuptools==68.2.0.0 typing-extensions==4.1.1 uproot==4.3.7 urllib3==1.26.16 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 9b29287..5c50705 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -161,7 +161,7 @@ tornado==6.2 tox==3.28.0 ; python_version < "3.8.0" traitlets==5.9.0 typed-ast==1.5.5 -types-setuptools==68.1.0.1 +types-setuptools==68.2.0.0 typing-extensions==4.7.1 uproot==5.0.11 uri-template==1.3.0 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 2baf945..a0e1161 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -170,7 +170,7 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.1 traitlets==5.9.0 -types-setuptools==68.1.0.1 +types-setuptools==68.2.0.0 typing-extensions==4.7.1 tzdata==2023.3 uproot==5.0.11 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 7080e64..0f84ba5 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -169,7 +169,7 @@ tomli==2.0.1 tornado==6.3.3 tox==4.11.1 traitlets==5.9.0 -types-setuptools==68.1.0.1 +types-setuptools==68.2.0.0 typing-extensions==4.7.1 tzdata==2023.3 uproot==5.0.11 From 7a8ffdf1f6a1569347271932f1134f91c393c0a5 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 9 Sep 2023 22:57:52 +0200 Subject: [PATCH 04/11] DX: enable language navigation on Jupyter Lab --- .gitignore | 1 + setup.cfg | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 900dd8c..89442d9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ version.py .ipynb_checkpoints/ .mypy*/ .pytest_cache/ +.virtual_documents/ __pycache__/ htmlcov/ prof/ diff --git a/setup.cfg b/setup.cfg index 0071ef4..68bb1a8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -91,10 +91,11 @@ sty = %(test)s # for pytest type hints pre-commit >=2.9.2 # for black jupyter = - aquirdturtle_collapsible_headings jupyterlab jupyterlab-code-formatter + jupyterlab-lsp jupyterlab-myst; python_version >="3.7.0" + python-lsp-server[rope] ypy-websocket <0.8.3; python_version >="3.7.0" # https://github.com/redeboer/PawianTools/actions/runs/4350341991/jobs/7600958375#step:3:78 dev = %(doc)s From 96ebe1df8e3ed3a27baf6ecc86163b54f937a7df Mon Sep 17 00:00:00 2001 From: GitHub Date: Sat, 9 Sep 2023 20:59:43 +0000 Subject: [PATCH 05/11] MAINT: update pip constraints and pre-commit --- .constraints/py3.10.txt | 19 +++++++++++++------ .constraints/py3.11.txt | 19 +++++++++++++------ .constraints/py3.6.txt | 7 ++++++- .constraints/py3.7.txt | 15 +++++++++++---- .constraints/py3.8.txt | 19 +++++++++++++------ .constraints/py3.9.txt | 19 +++++++++++++------ .pre-commit-config.yaml | 2 +- 7 files changed, 70 insertions(+), 30 deletions(-) diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index 3fecd85..8e40169 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -9,7 +9,6 @@ aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 anyio==4.0.0 -aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 @@ -20,7 +19,7 @@ awkward-cpp==23 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.7.0 +black==23.9.0 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 @@ -34,10 +33,11 @@ comm==0.1.4 contourpy==1.1.0 coverage==7.3.1 cycler==0.11.0 -debugpy==1.6.7.post1 +debugpy==1.7.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 +docstring-to-markdown==0.12 docutils==0.19 entrypoints==0.4 exceptiongroup==1.1.3 @@ -69,6 +69,7 @@ jupyter-cache==0.6.1 jupyter-client==7.4.9 jupyter-core==5.3.1 jupyter-events==0.7.0 +jupyter-lsp==2.2.0 jupyter-server==2.7.3 jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 @@ -76,6 +77,7 @@ jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 +jupyterlab-lsp==4.2.0 jupyterlab-myst==2.0.2 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 jupyterlab-server==2.24.0 @@ -125,12 +127,15 @@ pydeps==1.12.17 pygments==2.16.1 pyparsing==3.0.9 pyproject-api==1.6.1 -pytest==7.4.1 +pytest==7.4.2 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 +python-lsp-jsonrpc==1.1.0 +python-lsp-server==1.8.0 +pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==24.0.1 @@ -138,6 +143,7 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 +rope==1.9.0 rpds-py==0.10.2 ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 @@ -166,15 +172,16 @@ terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 -tox==4.11.1 +tox==4.11.3 traitlets==5.9.0 types-setuptools==68.2.0.0 typing-extensions==4.7.1 tzdata==2023.3 +ujson==5.8.0 uproot==5.0.11 uri-template==1.3.0 urllib3==2.0.4 -virtualenv==20.24.4 +virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 diff --git a/.constraints/py3.11.txt b/.constraints/py3.11.txt index 15d9199..24a4b62 100644 --- a/.constraints/py3.11.txt +++ b/.constraints/py3.11.txt @@ -9,7 +9,6 @@ aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 anyio==4.0.0 -aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 @@ -20,7 +19,7 @@ awkward-cpp==23 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.7.0 +black==23.9.0 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 @@ -34,10 +33,11 @@ comm==0.1.4 contourpy==1.1.0 coverage==7.3.1 cycler==0.11.0 -debugpy==1.6.7.post1 +debugpy==1.7.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 +docstring-to-markdown==0.12 docutils==0.19 entrypoints==0.4 execnet==2.0.2 @@ -68,6 +68,7 @@ jupyter-cache==0.6.1 jupyter-client==7.4.9 jupyter-core==5.3.1 jupyter-events==0.7.0 +jupyter-lsp==2.2.0 jupyter-server==2.7.3 jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 @@ -75,6 +76,7 @@ jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 +jupyterlab-lsp==4.2.0 jupyterlab-myst==2.0.2 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 jupyterlab-server==2.24.0 @@ -124,12 +126,15 @@ pydeps==1.12.17 pygments==2.16.1 pyparsing==3.0.9 pyproject-api==1.6.1 -pytest==7.4.1 +pytest==7.4.2 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 +python-lsp-jsonrpc==1.1.0 +python-lsp-server==1.8.0 +pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==24.0.1 @@ -137,6 +142,7 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 +rope==1.9.0 rpds-py==0.10.2 ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 @@ -164,15 +170,16 @@ tabulate==0.9.0 terminado==0.17.1 tinycss2==1.2.1 tornado==6.3.3 -tox==4.11.1 +tox==4.11.3 traitlets==5.9.0 types-setuptools==68.2.0.0 typing-extensions==4.7.1 tzdata==2023.3 +ujson==5.8.0 uproot==5.0.11 uri-template==1.3.0 urllib3==2.0.4 -virtualenv==20.24.4 +virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 diff --git a/.constraints/py3.6.txt b/.constraints/py3.6.txt index 96ccf20..3c44038 100644 --- a/.constraints/py3.6.txt +++ b/.constraints/py3.6.txt @@ -6,7 +6,6 @@ # alabaster==0.7.13 anyio==3.6.2 -aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==21.3.0 argon2-cffi-bindings==21.2.0 async-generator==1.10 @@ -57,11 +56,13 @@ jsonschema==3.2.0 jupyter-cache==0.4.3 jupyter-client==7.1.2 jupyter-core==4.9.2 +jupyter-lsp==1.5.1 jupyter-server==1.13.1 jupyter-server-mathjax==0.2.3 jupyter-sphinx==0.3.2 jupyterlab==3.2.9 jupyterlab-code-formatter==1.6.1 +jupyterlab-lsp==3.9.2 jupyterlab-pygments==0.1.2 jupyterlab-server==2.10.3 jupyterlab-widgets==1.1.5 @@ -111,10 +112,13 @@ pytest-cov==4.0.0 pytest-profiling==1.7.0 pytest-xdist==3.0.2 python-dateutil==2.8.2 +python-lsp-jsonrpc==1.0.0 +python-lsp-server==1.3.3 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==25.1.1 requests==2.27.1 +rope==1.1.1 send2trash==1.8.2 six==1.16.0 smmap==5.0.0 @@ -146,6 +150,7 @@ traitlets==4.3.3 typed-ast==1.5.5 types-setuptools==68.2.0.0 typing-extensions==4.1.1 +ujson==4.3.0 uproot==4.3.7 urllib3==1.26.16 virtualenv==20.15.1 ; python_version < "3.8.0" diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index 5c50705..0cb9ed9 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -9,7 +9,6 @@ aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 anyio==3.7.1 -aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 @@ -31,10 +30,11 @@ colorama==0.4.6 comm==0.1.4 coverage==7.2.7 cycler==0.11.0 -debugpy==1.6.7.post1 +debugpy==1.7.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 +docstring-to-markdown==0.12 docutils==0.17.1 entrypoints==0.4 exceptiongroup==1.1.3 @@ -56,7 +56,7 @@ ipython==7.34.0 ipython-genutils==0.2.0 ipywidgets==8.1.0 isoduration==20.11.0 -jedi==0.19.0 +jedi==0.18.2 jinja2==3.1.2 json5==0.9.14 jsonpointer==2.4 @@ -65,12 +65,14 @@ jupyter-cache==0.5.0 jupyter-client==7.4.9 jupyter-core==4.12.0 jupyter-events==0.6.3 +jupyter-lsp==1.5.1 jupyter-server==1.24.0 jupyter-server-fileid==0.9.0 jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 +jupyterlab-lsp==3.10.2 jupyterlab-myst==1.2.0 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 jupyterlab-server==2.24.0 @@ -120,18 +122,22 @@ pydeps==1.12.17 pygments==2.16.1 pyparsing==3.1.1 pyrsistent==0.19.3 -pytest==7.4.1 +pytest==7.4.2 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 +python-lsp-jsonrpc==1.0.0 +python-lsp-server==1.7.4 +pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==24.0.1 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 +rope==1.9.0 ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 six==1.16.0 @@ -163,6 +169,7 @@ traitlets==5.9.0 typed-ast==1.5.5 types-setuptools==68.2.0.0 typing-extensions==4.7.1 +ujson==5.7.0 uproot==5.0.11 uri-template==1.3.0 urllib3==2.0.4 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index a0e1161..ec9cd1e 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -9,7 +9,6 @@ aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 anyio==4.0.0 -aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 @@ -20,7 +19,7 @@ awkward-cpp==23 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.7.0 +black==23.9.0 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 @@ -34,10 +33,11 @@ comm==0.1.4 contourpy==1.1.0 coverage==7.3.1 cycler==0.11.0 -debugpy==1.6.7.post1 +debugpy==1.7.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 +docstring-to-markdown==0.12 docutils==0.19 entrypoints==0.4 exceptiongroup==1.1.3 @@ -70,6 +70,7 @@ jupyter-cache==0.6.1 jupyter-client==7.4.9 jupyter-core==5.3.1 jupyter-events==0.7.0 +jupyter-lsp==2.2.0 jupyter-server==2.7.3 jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 @@ -77,6 +78,7 @@ jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 +jupyterlab-lsp==4.2.0 jupyterlab-myst==2.0.2 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 jupyterlab-server==2.24.0 @@ -127,12 +129,15 @@ pydeps==1.12.17 pygments==2.16.1 pyparsing==3.0.9 pyproject-api==1.6.1 -pytest==7.4.1 +pytest==7.4.2 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 +python-lsp-jsonrpc==1.1.0 +python-lsp-server==1.8.0 +pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==24.0.1 @@ -140,6 +145,7 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 +rope==1.9.0 rpds-py==0.10.2 ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 @@ -168,15 +174,16 @@ terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 -tox==4.11.1 +tox==4.11.3 traitlets==5.9.0 types-setuptools==68.2.0.0 typing-extensions==4.7.1 tzdata==2023.3 +ujson==5.8.0 uproot==5.0.11 uri-template==1.3.0 urllib3==2.0.4 -virtualenv==20.24.4 +virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 0f84ba5..f8a4a39 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -9,7 +9,6 @@ aiofiles==22.1.0 aiosqlite==0.19.0 alabaster==0.7.13 anyio==4.0.0 -aquirdturtle-collapsible-headings==3.1.0 argon2-cffi==23.1.0 argon2-cffi-bindings==21.2.0 arrow==1.2.3 @@ -20,7 +19,7 @@ awkward-cpp==23 babel==2.12.1 backcall==0.2.0 beautifulsoup4==4.12.2 -black==23.7.0 +black==23.9.0 bleach==6.0.0 cachetools==5.3.1 certifi==2023.7.22 @@ -34,10 +33,11 @@ comm==0.1.4 contourpy==1.1.0 coverage==7.3.1 cycler==0.11.0 -debugpy==1.6.7.post1 +debugpy==1.7.0 decorator==5.1.1 defusedxml==0.7.1 distlib==0.3.7 +docstring-to-markdown==0.12 docutils==0.19 entrypoints==0.4 exceptiongroup==1.1.3 @@ -70,6 +70,7 @@ jupyter-cache==0.6.1 jupyter-client==7.4.9 jupyter-core==5.3.1 jupyter-events==0.7.0 +jupyter-lsp==2.2.0 jupyter-server==2.7.3 jupyter-server-fileid==0.9.0 jupyter-server-terminals==0.4.4 @@ -77,6 +78,7 @@ jupyter-server-ydoc==0.8.0 jupyter-ydoc==0.2.4 jupyterlab==3.6.5 jupyterlab-code-formatter==2.2.1 +jupyterlab-lsp==4.2.0 jupyterlab-myst==2.0.2 ; python_version >= "3.7.0" jupyterlab-pygments==0.2.2 jupyterlab-server==2.24.0 @@ -126,12 +128,15 @@ pydeps==1.12.17 pygments==2.16.1 pyparsing==3.0.9 pyproject-api==1.6.1 -pytest==7.4.1 +pytest==7.4.2 pytest-cov==4.1.0 pytest-profiling==1.7.0 pytest-xdist==3.3.1 python-dateutil==2.8.2 python-json-logger==2.0.7 +python-lsp-jsonrpc==1.1.0 +python-lsp-server==1.8.0 +pytoolconfig==1.2.5 pytz==2023.3.post1 pyyaml==6.0.1 pyzmq==24.0.1 @@ -139,6 +144,7 @@ referencing==0.30.2 requests==2.31.0 rfc3339-validator==0.1.4 rfc3986-validator==0.1.1 +rope==1.9.0 rpds-py==0.10.2 ruff==0.0.287 ; python_version >= "3.7.0" send2trash==1.8.2 @@ -167,15 +173,16 @@ terminado==0.17.1 tinycss2==1.2.1 tomli==2.0.1 tornado==6.3.3 -tox==4.11.1 +tox==4.11.3 traitlets==5.9.0 types-setuptools==68.2.0.0 typing-extensions==4.7.1 tzdata==2023.3 +ujson==5.8.0 uproot==5.0.11 uri-template==1.3.0 urllib3==2.0.4 -virtualenv==20.24.4 +virtualenv==20.24.5 wcwidth==0.2.6 webcolors==1.13 webencodings==0.5.1 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b6ed634..8f79cae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: - id: format-setup-cfg - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 23.9.0 hooks: - id: black From dca4e76e97611e3a4a190370dd0918631da2851f Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 9 Sep 2023 23:09:54 +0200 Subject: [PATCH 06/11] MAINT: address `pandas` deprecation warning https://github.com/redeboer/PawianTools/actions/runs/6133122417/job/16644710440?pr=38#step:6:210 --- src/pawian/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pawian/data.py b/src/pawian/data.py index c6a0721..03f0bf5 100644 --- a/src/pawian/data.py +++ b/src/pawian/data.py @@ -142,7 +142,7 @@ def rho2(self) -> pd.DataFrame: """Compute a dataframe containing the square sum of the 3-momenta.""" p3_squared = self.p_xyz**2 # type: ignore[operator] if self.has_particles: - return p3_squared.groupby(axis=1, level=0).sum() + return p3_squared.T.groupby(level=0).sum() return p3_squared.sum(axis=1) @property From dde3fd172a817e8a0631637ba23cb2fecc8a5302 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 9 Sep 2023 23:10:47 +0200 Subject: [PATCH 07/11] MAINT: fix sorting --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bb62e7e..e254d52 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,11 +25,11 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "black-formatter.importStrategy": "fromEnvironment", - "cSpell.enabled": true, "coverage-gutters.coverageFileNames": ["coverage.xml"], "coverage-gutters.coverageReportFileName": "**/htmlcov/index.html", "coverage-gutters.showGutterCoverage": false, "coverage-gutters.showLineCoverage": true, + "cSpell.enabled": true, "editor.formatOnSave": true, "editor.rulers": [88], "git.rebaseWhenSync": true, From e48d5c10f60795dd537982bd9abb903a55a480d1 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 9 Sep 2023 23:15:02 +0200 Subject: [PATCH 08/11] Revert "MAINT: fix sorting" This reverts commit dde3fd172a817e8a0631637ba23cb2fecc8a5302. --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index e254d52..bb62e7e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,11 +25,11 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "black-formatter.importStrategy": "fromEnvironment", + "cSpell.enabled": true, "coverage-gutters.coverageFileNames": ["coverage.xml"], "coverage-gutters.coverageReportFileName": "**/htmlcov/index.html", "coverage-gutters.showGutterCoverage": false, "coverage-gutters.showLineCoverage": true, - "cSpell.enabled": true, "editor.formatOnSave": true, "editor.rulers": [88], "git.rebaseWhenSync": true, From 298f212964f3485e5884b9d459deea35f3ab51ca Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 9 Sep 2023 23:16:11 +0200 Subject: [PATCH 09/11] MAINT: ignore `pandas` `FutureWarning` --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 98339c8..fa5e715 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -107,6 +107,7 @@ addopts = ''' filterwarnings = [ "error", "ignore:.*Consider switching from .* to .*:DeprecationWarning", + "ignore:DataFrame.groupby with axis=1 is deprecated.*:FutureWarning", "ignore:Using the level keyword in DataFrame and Series aggregations is deprecated.*:FutureWarning", "ignore:the imp module is deprecated in favour of importlib.*:DeprecationWarning", ] From 6b9e0b49c3bbe84739e2744bbb60573407a51e92 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 9 Sep 2023 23:19:13 +0200 Subject: [PATCH 10/11] MAINT: fix sorting --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index bb62e7e..e254d52 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -25,11 +25,11 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "black-formatter.importStrategy": "fromEnvironment", - "cSpell.enabled": true, "coverage-gutters.coverageFileNames": ["coverage.xml"], "coverage-gutters.coverageReportFileName": "**/htmlcov/index.html", "coverage-gutters.showGutterCoverage": false, "coverage-gutters.showLineCoverage": true, + "cSpell.enabled": true, "editor.formatOnSave": true, "editor.rulers": [88], "git.rebaseWhenSync": true, From 5715c8d6782761a3bd4a81d5326ae12c7992b3f7 Mon Sep 17 00:00:00 2001 From: Remco de Boer <29308176+redeboer@users.noreply.github.com> Date: Sat, 9 Sep 2023 23:19:41 +0200 Subject: [PATCH 11/11] Revert "MAINT: address `pandas` deprecation warning" This reverts commit dca4e76e97611e3a4a190370dd0918631da2851f. --- src/pawian/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pawian/data.py b/src/pawian/data.py index 03f0bf5..c6a0721 100644 --- a/src/pawian/data.py +++ b/src/pawian/data.py @@ -142,7 +142,7 @@ def rho2(self) -> pd.DataFrame: """Compute a dataframe containing the square sum of the 3-momenta.""" p3_squared = self.p_xyz**2 # type: ignore[operator] if self.has_particles: - return p3_squared.T.groupby(level=0).sum() + return p3_squared.groupby(axis=1, level=0).sum() return p3_squared.sum(axis=1) @property