From ca0740cd45fb15b712ee33ebd3540cce64613a13 Mon Sep 17 00:00:00 2001 From: David Lord Date: Mon, 29 Jan 2024 10:55:11 -0800 Subject: [PATCH] use pip-compile, dependabot updates --- .github/dependabot.yml | 23 +++++--- .pre-commit-config.yaml | 14 ++--- requirements/build.txt | 13 ++--- requirements/dev.in | 1 - requirements/dev.txt | 126 ++++++++++++++++++++++++++++------------ requirements/docs.in | 4 +- requirements/docs.txt | 49 ++++++++-------- requirements/tests.txt | 15 +++-- requirements/typing.txt | 13 ++--- tox.ini | 14 +++++ 10 files changed, 168 insertions(+), 104 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 90f94bc3..1f47f125 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,9 +1,18 @@ version: 2 updates: -- package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "monthly" - day: "monday" - time: "16:00" - timezone: "UTC" + - package-ecosystem: github-actions + directory: / + schedule: + interval: monthly + groups: + github-actions: + patterns: + - '*' + - package-ecosystem: pip + directory: /requirements/ + schedule: + interval: monthly + groups: + python-requirements: + patterns: + - '*' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6ee28629..fadf5526 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,31 +3,27 @@ ci: autoupdate_schedule: monthly repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.10.1 + rev: v3.15.0 hooks: - id: pyupgrade args: ["--py37-plus"] - repo: https://github.com/asottile/reorder-python-imports - rev: v3.10.0 + rev: v3.12.0 hooks: - id: reorder-python-imports args: ["--application-directories", "src"] additional_dependencies: ["setuptools>60.9"] - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 24.1.1 hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 6.1.0 + rev: 7.0.0 hooks: - id: flake8 additional_dependencies: [flake8-bugbear] - - repo: https://github.com/peterdemin/pip-compile-multi - rev: v2.6.3 - hooks: - - id: pip-compile-multi-verify - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: fix-byte-order-marker - id: trailing-whitespace diff --git a/requirements/build.txt b/requirements/build.txt index 196545d0..e1265c98 100644 --- a/requirements/build.txt +++ b/requirements/build.txt @@ -1,13 +1,12 @@ -# SHA1:80754af91bfb6d1073585b046fe0a474ce868509 # -# This file is autogenerated by pip-compile-multi -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # -# pip-compile-multi +# pip-compile --pip-args='--python-version=3.7' --strip-extras build.in # -build==0.10.0 - # via -r requirements/build.in -packaging==23.1 +build==1.0.3 + # via -r build.in +packaging==23.2 # via build pyproject-hooks==1.0.0 # via build diff --git a/requirements/dev.in b/requirements/dev.in index 99f5942f..cc6adb72 100644 --- a/requirements/dev.in +++ b/requirements/dev.in @@ -1,6 +1,5 @@ -r docs.in -r tests.in -r typing.in -pip-compile-multi pre-commit tox diff --git a/requirements/dev.txt b/requirements/dev.txt index ed462080..6293ecaf 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,64 +1,114 @@ -# SHA1:54b5b77ec8c7a0064ffa93b2fd16cb0130ba177c # -# This file is autogenerated by pip-compile-multi -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # -# pip-compile-multi +# pip-compile --pip-args='--python-version=3.7' --strip-extras dev.in # --r docs.txt --r tests.txt --r typing.txt -build==0.10.0 - # via pip-tools -cachetools==5.3.1 +alabaster==0.7.16 + # via sphinx +babel==2.14.0 + # via sphinx +cachetools==5.3.2 # via tox -cfgv==3.3.1 +certifi==2023.11.17 + # via requests +cfgv==3.4.0 # via pre-commit -chardet==5.1.0 +chardet==5.2.0 # via tox -click==8.1.3 - # via - # pip-compile-multi - # pip-tools +charset-normalizer==3.3.2 + # via requests colorama==0.4.6 # via tox -distlib==0.3.6 +distlib==0.3.8 # via virtualenv -filelock==3.12.2 +docutils==0.20.1 + # via sphinx +filelock==3.13.1 # via # tox # virtualenv -identify==2.5.24 +identify==2.5.33 # via pre-commit +idna==3.6 + # via requests +imagesize==1.4.1 + # via sphinx +iniconfig==2.0.0 + # via pytest +jinja2==3.1.3 + # via sphinx +markupsafe==2.1.4 + # via jinja2 +mypy==1.8.0 + # via -r typing.in +mypy-extensions==1.0.0 + # via mypy nodeenv==1.8.0 # via pre-commit -pip-compile-multi==2.6.3 - # via -r requirements/dev.in -pip-tools==6.13.0 - # via pip-compile-multi -platformdirs==3.8.0 +packaging==23.2 + # via + # pallets-sphinx-themes + # pyproject-api + # pytest + # sphinx + # tox +pallets-sphinx-themes==2.1.1 + # via -r docs.in +platformdirs==4.1.0 # via # tox # virtualenv -pre-commit==3.3.3 - # via -r requirements/dev.in -pyproject-api==1.5.2 +pluggy==1.4.0 + # via + # pytest + # tox +pre-commit==3.6.0 + # via -r dev.in +pygments==2.17.2 + # via sphinx +pyproject-api==1.6.1 # via tox -pyproject-hooks==1.0.0 - # via build -pyyaml==6.0 +pytest==8.0.0 + # via -r tests.in +pyyaml==6.0.1 # via pre-commit -toposort==1.10 - # via pip-compile-multi -tox==4.6.3 - # via -r requirements/dev.in -virtualenv==20.23.1 +requests==2.31.0 + # via sphinx +snowballstemmer==2.2.0 + # via sphinx +sphinx==7.2.6 + # via + # -r docs.in + # pallets-sphinx-themes + # sphinx-issues + # sphinxcontrib-log-cabinet +sphinx-issues==4.0.0 + # via -r docs.in +sphinxcontrib-applehelp==1.0.8 + # via sphinx +sphinxcontrib-devhelp==1.0.6 + # via sphinx +sphinxcontrib-htmlhelp==2.0.5 + # via sphinx +sphinxcontrib-jsmath==1.0.1 + # via sphinx +sphinxcontrib-log-cabinet==1.0.1 + # via -r docs.in +sphinxcontrib-qthelp==1.0.7 + # via sphinx +sphinxcontrib-serializinghtml==1.1.10 + # via sphinx +tox==4.12.1 + # via -r dev.in +typing-extensions==4.9.0 + # via mypy +urllib3==2.1.0 + # via requests +virtualenv==20.25.0 # via # pre-commit # tox -wheel==0.40.0 - # via pip-tools # The following packages are considered to be unsafe in a requirements file: -# pip # setuptools diff --git a/requirements/docs.in b/requirements/docs.in index 7ec501b6..88fd7721 100644 --- a/requirements/docs.in +++ b/requirements/docs.in @@ -1,4 +1,4 @@ -Pallets-Sphinx-Themes -Sphinx +pallets-sphinx-themes +sphinx sphinx-issues sphinxcontrib-log-cabinet diff --git a/requirements/docs.txt b/requirements/docs.txt index e125c59a..9fff8a96 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,61 +1,60 @@ -# SHA1:45c590f97fe95b8bdc755eef796e91adf5fbe4ea # -# This file is autogenerated by pip-compile-multi -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # -# pip-compile-multi +# pip-compile --pip-args='--python-version=3.7' --strip-extras docs.in # -alabaster==0.7.13 +alabaster==0.7.16 # via sphinx -babel==2.12.1 +babel==2.14.0 # via sphinx -certifi==2023.5.7 +certifi==2023.11.17 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.3.2 # via requests docutils==0.20.1 # via sphinx -idna==3.4 +idna==3.6 # via requests imagesize==1.4.1 # via sphinx -jinja2==3.1.2 +jinja2==3.1.3 # via sphinx -markupsafe==2.1.3 +markupsafe==2.1.4 # via jinja2 -packaging==23.1 +packaging==23.2 # via # pallets-sphinx-themes # sphinx pallets-sphinx-themes==2.1.1 - # via -r requirements/docs.in -pygments==2.15.1 + # via -r docs.in +pygments==2.17.2 # via sphinx requests==2.31.0 # via sphinx snowballstemmer==2.2.0 # via sphinx -sphinx==7.0.1 +sphinx==7.2.6 # via - # -r requirements/docs.in + # -r docs.in # pallets-sphinx-themes # sphinx-issues # sphinxcontrib-log-cabinet -sphinx-issues==3.0.1 - # via -r requirements/docs.in -sphinxcontrib-applehelp==1.0.4 +sphinx-issues==4.0.0 + # via -r docs.in +sphinxcontrib-applehelp==1.0.8 # via sphinx -sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-devhelp==1.0.6 # via sphinx -sphinxcontrib-htmlhelp==2.0.1 +sphinxcontrib-htmlhelp==2.0.5 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-log-cabinet==1.0.1 - # via -r requirements/docs.in -sphinxcontrib-qthelp==1.0.3 + # via -r docs.in +sphinxcontrib-qthelp==1.0.7 # via sphinx -sphinxcontrib-serializinghtml==1.1.5 +sphinxcontrib-serializinghtml==1.1.10 # via sphinx -urllib3==2.0.3 +urllib3==2.1.0 # via requests diff --git a/requirements/tests.txt b/requirements/tests.txt index 6a680886..8920cc5f 100644 --- a/requirements/tests.txt +++ b/requirements/tests.txt @@ -1,15 +1,14 @@ -# SHA1:0eaa389e1fdb3a1917c0f987514bd561be5718ee # -# This file is autogenerated by pip-compile-multi -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # -# pip-compile-multi +# pip-compile --pip-args='--python-version=3.7' --strip-extras tests.in # iniconfig==2.0.0 # via pytest -packaging==23.1 +packaging==23.2 # via pytest -pluggy==1.2.0 +pluggy==1.4.0 # via pytest -pytest==7.4.0 - # via -r requirements/tests.in +pytest==8.0.0 + # via -r tests.in diff --git a/requirements/typing.txt b/requirements/typing.txt index 13afd660..400a500c 100644 --- a/requirements/typing.txt +++ b/requirements/typing.txt @@ -1,13 +1,12 @@ -# SHA1:7983aaa01d64547827c20395d77e248c41b2572f # -# This file is autogenerated by pip-compile-multi -# To update, run: +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: # -# pip-compile-multi +# pip-compile --pip-args='--python-version=3.7' --strip-extras typing.in # -mypy==1.4.1 - # via -r requirements/typing.in +mypy==1.8.0 + # via -r typing.in mypy-extensions==1.0.0 # via mypy -typing-extensions==4.6.3 +typing-extensions==4.9.0 # via mypy diff --git a/tox.ini b/tox.ini index 79a91c73..6bddf3d3 100644 --- a/tox.ini +++ b/tox.ini @@ -24,3 +24,17 @@ commands = mypy [testenv:docs] deps = -r requirements/docs.txt commands = sphinx-build -W -b html -d {envtmpdir}/doctrees docs {envtmpdir}/html + +[testenv:update-requirements] +deps = + pip-tools + pre-commit +skip_install = true +change_dir = requirements +commands = + pre-commit autoupdate -j4 + pip-compile -U build.in + pip-compile -U docs.in + pip-compile -U tests.in + pip-compile -U typing.in + pip-compile -U dev.in