diff --git a/.constraints/py3.10.txt b/.constraints/py3.10.txt index ca81e6c2..b20b76b3 100644 --- a/.constraints/py3.10.txt +++ b/.constraints/py3.10.txt @@ -14,7 +14,7 @@ babel==2.9.1 backcall==0.2.0 backports.entry-points-selectable==1.1.1 beautifulsoup4==4.10.0 -black==21.10b0 +black==21.11b0 bleach==4.1.0 certifi==2021.10.8 cffi==1.15.0 @@ -31,7 +31,7 @@ distlib==0.3.3 docutils==0.16 entrypoints==0.3 execnet==1.9.0 -filelock==3.3.2 +filelock==3.4.0 flake8==4.0.1 flake8-blind-except==0.2.0 flake8-bugbear==21.9.2 @@ -47,10 +47,10 @@ fuzzywuzzy==0.18.0 gitdb==4.0.9 gitpython==3.1.24 gprof2dot==2021.2.21 -graphviz==0.18.1 +graphviz==0.18.2 greenlet==1.1.2 hepunits==2.1.2 -identify==2.3.5 +identify==2.3.6 idna==3.3 imagesize==1.3.0 importlib-metadata==4.8.2 @@ -61,7 +61,7 @@ ipython==7.29.0 ipython-genutils==0.2.0 ipywidgets==7.6.5 isort==5.10.1 -jedi==0.18.0 +jedi==0.18.1 jinja2==3.0.3 json5==0.9.6 jsonschema==4.2.1 @@ -97,7 +97,7 @@ nbdime==3.1.1 nbformat==5.1.3 nest-asyncio==1.5.1 nodeenv==1.6.0 -notebook==6.4.5 +notebook==6.4.6 packaging==21.2 pandocfilters==1.5.0 parso==0.8.2 @@ -147,7 +147,7 @@ send2trash==1.8.0 six==1.16.0 smmap==5.0.0 sniffio==1.2.0 -snowballstemmer==2.1.0 +snowballstemmer==2.2.0 soupsieve==2.3.1 sphinx==4.3.0 sphinx-autobuild==2021.3.14 diff --git a/.constraints/py3.6.txt b/.constraints/py3.6.txt index 8b66be75..feef3a0f 100644 --- a/.constraints/py3.6.txt +++ b/.constraints/py3.6.txt @@ -15,7 +15,7 @@ babel==2.9.1 backcall==0.2.0 backports.entry-points-selectable==1.1.1 beautifulsoup4==4.10.0 -black==21.10b0 +black==21.11b0 bleach==4.1.0 certifi==2021.10.8 cffi==1.15.0 @@ -33,7 +33,7 @@ distlib==0.3.3 docutils==0.16 entrypoints==0.3 execnet==1.9.0 -filelock==3.3.2 +filelock==3.4.0 flake8==4.0.1 flake8-blind-except==0.2.0 flake8-bugbear==21.9.2 @@ -48,10 +48,10 @@ fuzzywuzzy==0.18.0 gitdb==4.0.9 gitpython==3.1.18 gprof2dot==2021.2.21 -graphviz==0.18.1 +graphviz==0.18.2 greenlet==1.1.2 hepunits==2.1.2 -identify==2.3.5 +identify==2.3.6 idna==3.3 imagesize==1.3.0 immutables==0.16 @@ -63,7 +63,7 @@ ipython==7.16.1 ipython-genutils==0.2.0 ipywidgets==7.6.5 isort==5.10.1 -jedi==0.18.0 +jedi==0.18.1 jinja2==3.0.3 json5==0.9.6 jsonschema==3.2.0 @@ -98,7 +98,7 @@ nbdime==3.1.1 nbformat==5.1.3 nest-asyncio==1.5.1 nodeenv==1.6.0 -notebook==6.4.5 +notebook==6.4.6 packaging==21.2 pandocfilters==1.5.0 parso==0.8.2 @@ -148,7 +148,7 @@ send2trash==1.8.0 six==1.16.0 smmap==5.0.0 sniffio==1.2.0 -snowballstemmer==2.1.0 +snowballstemmer==2.2.0 soupsieve==2.3.1 sphinx==4.3.0 sphinx-autobuild==2021.3.14 diff --git a/.constraints/py3.7.txt b/.constraints/py3.7.txt index be07f7ce..4f9d0159 100644 --- a/.constraints/py3.7.txt +++ b/.constraints/py3.7.txt @@ -15,7 +15,7 @@ babel==2.9.1 backcall==0.2.0 backports.entry-points-selectable==1.1.1 beautifulsoup4==4.10.0 -black==21.10b0 +black==21.11b0 bleach==4.1.0 certifi==2021.10.8 cffi==1.15.0 @@ -32,7 +32,7 @@ distlib==0.3.3 docutils==0.16 entrypoints==0.3 execnet==1.9.0 -filelock==3.3.2 +filelock==3.4.0 flake8==4.0.1 flake8-blind-except==0.2.0 flake8-bugbear==21.9.2 @@ -47,10 +47,10 @@ fuzzywuzzy==0.18.0 gitdb==4.0.9 gitpython==3.1.24 gprof2dot==2021.2.21 -graphviz==0.18.1 +graphviz==0.18.2 greenlet==1.1.2 hepunits==2.1.2 -identify==2.3.5 +identify==2.3.6 idna==3.3 imagesize==1.3.0 importlib-metadata==4.2.0 @@ -61,7 +61,7 @@ ipython==7.29.0 ipython-genutils==0.2.0 ipywidgets==7.6.5 isort==5.10.1 -jedi==0.18.0 +jedi==0.18.1 jinja2==3.0.3 json5==0.9.6 jsonschema==4.2.1 @@ -97,7 +97,7 @@ nbdime==3.1.1 nbformat==5.1.3 nest-asyncio==1.5.1 nodeenv==1.6.0 -notebook==6.4.5 +notebook==6.4.6 packaging==21.2 pandocfilters==1.5.0 parso==0.8.2 @@ -147,7 +147,7 @@ send2trash==1.8.0 six==1.16.0 smmap==5.0.0 sniffio==1.2.0 -snowballstemmer==2.1.0 +snowballstemmer==2.2.0 soupsieve==2.3.1 sphinx==4.3.0 sphinx-autobuild==2021.3.14 diff --git a/.constraints/py3.8.txt b/.constraints/py3.8.txt index 5c5d7a3a..0477b023 100644 --- a/.constraints/py3.8.txt +++ b/.constraints/py3.8.txt @@ -14,7 +14,7 @@ babel==2.9.1 backcall==0.2.0 backports.entry-points-selectable==1.1.1 beautifulsoup4==4.10.0 -black==21.10b0 +black==21.11b0 bleach==4.1.0 certifi==2021.10.8 cffi==1.15.0 @@ -31,7 +31,7 @@ distlib==0.3.3 docutils==0.16 entrypoints==0.3 execnet==1.9.0 -filelock==3.3.2 +filelock==3.4.0 flake8==4.0.1 flake8-blind-except==0.2.0 flake8-bugbear==21.9.2 @@ -47,10 +47,10 @@ fuzzywuzzy==0.18.0 gitdb==4.0.9 gitpython==3.1.24 gprof2dot==2021.2.21 -graphviz==0.18.1 +graphviz==0.18.2 greenlet==1.1.2 hepunits==2.1.2 -identify==2.3.5 +identify==2.3.6 idna==3.3 imagesize==1.3.0 importlib-metadata==4.8.2 @@ -61,7 +61,7 @@ ipython==7.29.0 ipython-genutils==0.2.0 ipywidgets==7.6.5 isort==5.10.1 -jedi==0.18.0 +jedi==0.18.1 jinja2==3.0.3 json5==0.9.6 jsonschema==4.2.1 @@ -97,7 +97,7 @@ nbdime==3.1.1 nbformat==5.1.3 nest-asyncio==1.5.1 nodeenv==1.6.0 -notebook==6.4.5 +notebook==6.4.6 packaging==21.2 pandocfilters==1.5.0 parso==0.8.2 @@ -147,7 +147,7 @@ send2trash==1.8.0 six==1.16.0 smmap==5.0.0 sniffio==1.2.0 -snowballstemmer==2.1.0 +snowballstemmer==2.2.0 soupsieve==2.3.1 sphinx==4.3.0 sphinx-autobuild==2021.3.14 diff --git a/.constraints/py3.9.txt b/.constraints/py3.9.txt index 6e0f514f..a17a2e44 100644 --- a/.constraints/py3.9.txt +++ b/.constraints/py3.9.txt @@ -14,7 +14,7 @@ babel==2.9.1 backcall==0.2.0 backports.entry-points-selectable==1.1.1 beautifulsoup4==4.10.0 -black==21.10b0 +black==21.11b0 bleach==4.1.0 certifi==2021.10.8 cffi==1.15.0 @@ -31,7 +31,7 @@ distlib==0.3.3 docutils==0.16 entrypoints==0.3 execnet==1.9.0 -filelock==3.3.2 +filelock==3.4.0 flake8==4.0.1 flake8-blind-except==0.2.0 flake8-bugbear==21.9.2 @@ -47,10 +47,10 @@ fuzzywuzzy==0.18.0 gitdb==4.0.9 gitpython==3.1.24 gprof2dot==2021.2.21 -graphviz==0.18.1 +graphviz==0.18.2 greenlet==1.1.2 hepunits==2.1.2 -identify==2.3.5 +identify==2.3.6 idna==3.3 imagesize==1.3.0 importlib-metadata==4.8.2 @@ -61,7 +61,7 @@ ipython==7.29.0 ipython-genutils==0.2.0 ipywidgets==7.6.5 isort==5.10.1 -jedi==0.18.0 +jedi==0.18.1 jinja2==3.0.3 json5==0.9.6 jsonschema==4.2.1 @@ -97,7 +97,7 @@ nbdime==3.1.1 nbformat==5.1.3 nest-asyncio==1.5.1 nodeenv==1.6.0 -notebook==6.4.5 +notebook==6.4.6 packaging==21.2 pandocfilters==1.5.0 parso==0.8.2 @@ -147,7 +147,7 @@ send2trash==1.8.0 six==1.16.0 smmap==5.0.0 sniffio==1.2.0 -snowballstemmer==2.1.0 +snowballstemmer==2.2.0 soupsieve==2.3.1 sphinx==4.3.0 sphinx-autobuild==2021.3.14 diff --git a/.github/workflows/requirements-cron.yml b/.github/workflows/requirements-cron.yml index 15c9b1b4..de434c06 100644 --- a/.github/workflows/requirements-cron.yml +++ b/.github/workflows/requirements-cron.yml @@ -43,10 +43,15 @@ jobs: token: ${{ secrets.PAT }} # GITHUB_TOKEN will not rerun checks after pushing to a PR branch - uses: actions/download-artifact@v2 - - run: | - [[ -f .pre-commit-config.yaml ]] && mv -f .pre-commit-config.yaml .. - mv -f * ../.constraints/ - working-directory: artifact + - run: ls -A + - name: Move artifacts to correct location + run: | + if [[ -d artifact ]]; then + cd artifact + ls -A + [[ -f .pre-commit-config.yaml ]] && mv -f .pre-commit-config.yaml .. + [[ "$(ls)" != "" ]] && mv -f * ../.constraints/ + fi - run: git status -s - name: Create Pull Request uses: peter-evans/create-pull-request@v3 diff --git a/.github/workflows/requirements-pr.yml b/.github/workflows/requirements-pr.yml index c37824f3..41c3154b 100644 --- a/.github/workflows/requirements-pr.yml +++ b/.github/workflows/requirements-pr.yml @@ -27,7 +27,7 @@ jobs: run: git diff origin/main --exit-code -- .constraints setup.cfg continue-on-error: true - uses: ComPWA/update-pip-constraints@main - if: success() + if: failure() with: python-version: ${{ matrix.python-version }} @@ -42,7 +42,7 @@ jobs: run: git diff origin/main --exit-code -- .pre-commit-config.yml continue-on-error: true - uses: ComPWA/update-pre-commit@main - if: success() + if: failure() push: name: Push changes @@ -59,10 +59,14 @@ jobs: token: ${{ secrets.PAT }} # GITHUB_TOKEN will not rerun checks after pushing to a PR branch - uses: actions/download-artifact@v2 - - run: | - [[ -f .pre-commit-config.yaml ]] && mv -f .pre-commit-config.yaml .. - mv -f * ../.constraints/ - working-directory: artifact + - name: Move artifacts to correct location + run: | + if [[ -d artifact ]]; then + cd artifact + ls -A + [[ -f .pre-commit-config.yaml ]] && mv -f .pre-commit-config.yaml .. + [[ "$(ls)" != "" ]] && mv -f * ../.constraints/ + fi - run: git status -s - name: Commit and push changes run: | diff --git a/.gitpod.yml b/.gitpod.yml index 6c95089a..bbcb2786 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -15,7 +15,6 @@ vscode: extensions: - bungcip.better-toml - christian-kohler.path-intellisense - - codestream.codestream - davidanson.vscode-markdownlint - eamodio.gitlens - editorconfig.editorconfig diff --git a/.mypy.ini b/.mypy.ini index dfb2a916..4a48aec2 100644 --- a/.mypy.ini +++ b/.mypy.ini @@ -1,11 +1,9 @@ [mypy] disallow_incomplete_defs = True disallow_untyped_defs = True +files = **/*.py show_error_codes = True warn_unused_configs = True -files = - **/*.py, - **/*.pyi, [mypy-tests.*] check_untyped_defs = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9ef9063c..a4137cc5 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -41,7 +41,7 @@ repos: - id: trailing-whitespace - repo: https://github.com/ComPWA/repo-maintenance - rev: 0.0.81 + rev: 0.0.86 hooks: - id: check-dev-files args: @@ -54,7 +54,7 @@ repos: - id: format-setup-cfg - repo: https://github.com/psf/black - rev: 21.10b0 + rev: 21.11b0 hooks: - id: black @@ -141,7 +141,7 @@ repos: - id: pyright - repo: https://github.com/asottile/pyupgrade - rev: v2.29.0 + rev: v2.29.1 hooks: - id: pyupgrade args: @@ -163,6 +163,7 @@ repos: name: mypy entry: mypy language: system + require_serial: true types: - python diff --git a/.vscode/extensions.json b/.vscode/extensions.json index f9392bd0..890c2761 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,7 +2,6 @@ "recommendations": [ "bungcip.better-toml", "christian-kohler.path-intellisense", - "codestream.codestream", "davidanson.vscode-markdownlint", "eamodio.gitlens", "editorconfig.editorconfig",