From e6ad75d618bc71b0a5b2106ac4ebfc54ad64fa2c Mon Sep 17 00:00:00 2001 From: DeltaDaniel Date: Tue, 5 Dec 2023 15:37:20 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=8DPin=20CI-Dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cf. https://github.com/Hochfrequenz/edi_energy_scraper/issues/72) + pre-commit autoupdate --- .github/dependabot.yml | 4 ++ .pre-commit-config.yaml | 6 +- dev_requirements/requirements-coverage.in | 2 + dev_requirements/requirements-coverage.txt | 8 +++ dev_requirements/requirements-formatting.in | 3 + dev_requirements/requirements-formatting.txt | 22 +++++++ dev_requirements/requirements-linting.in | 2 + dev_requirements/requirements-linting.txt | 22 +++++++ .../requirements-test_packaging.in | 3 + .../requirements-test_packaging.txt | 66 +++++++++++++++++++ dev_requirements/requirements-tests.in | 6 ++ dev_requirements/requirements-tests.txt | 46 +++++++++++++ dev_requirements/requirements-type_check.in | 2 + dev_requirements/requirements-type_check.txt | 12 ++++ requirements.txt | 24 ++----- tox.ini | 18 ++--- 16 files changed, 213 insertions(+), 33 deletions(-) create mode 100644 dev_requirements/requirements-coverage.in create mode 100644 dev_requirements/requirements-coverage.txt create mode 100644 dev_requirements/requirements-formatting.in create mode 100644 dev_requirements/requirements-formatting.txt create mode 100644 dev_requirements/requirements-linting.in create mode 100644 dev_requirements/requirements-linting.txt create mode 100644 dev_requirements/requirements-test_packaging.in create mode 100644 dev_requirements/requirements-test_packaging.txt create mode 100644 dev_requirements/requirements-tests.in create mode 100644 dev_requirements/requirements-tests.txt create mode 100644 dev_requirements/requirements-type_check.in create mode 100644 dev_requirements/requirements-type_check.txt diff --git a/.github/dependabot.yml b/.github/dependabot.yml index df0cc59..ffdf8f3 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -9,6 +9,10 @@ updates: directory: "/" # Location of package manifests schedule: interval: "weekly" + - package-ecosystem: "pip" # See documentation for possible values + directory: "/dev_requirements/" # Location of package manifests + schedule: + interval: "weekly" # Maintain dependencies for GitHub Actions - package-ecosystem: "github-actions" directory: "/" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 713b517..79d92ae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,17 +1,17 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.3.0 + rev: v4.5.0 hooks: - id: check-yaml - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/psf/black - rev: 20.8b1 # Replace by any tag/version: https://github.com/psf/black/tags + rev: 23.11.0 # Replace by any tag/version: https://github.com/psf/black/tags hooks: - id: black language_version: python3 - repo: https://github.com/pycqa/isort - rev: 5.8.0 + rev: 5.12.0 hooks: - id: isort name: isort (python) diff --git a/dev_requirements/requirements-coverage.in b/dev_requirements/requirements-coverage.in new file mode 100644 index 0000000..d1e1a80 --- /dev/null +++ b/dev_requirements/requirements-coverage.in @@ -0,0 +1,2 @@ +# specific requirements for the tox coverage env +coverage diff --git a/dev_requirements/requirements-coverage.txt b/dev_requirements/requirements-coverage.txt new file mode 100644 index 0000000..6821108 --- /dev/null +++ b/dev_requirements/requirements-coverage.txt @@ -0,0 +1,8 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile '.\requirements-coverage.in' +# +coverage==7.3.2 + # via -r .\requirements-coverage.in diff --git a/dev_requirements/requirements-formatting.in b/dev_requirements/requirements-formatting.in new file mode 100644 index 0000000..fe07ba6 --- /dev/null +++ b/dev_requirements/requirements-formatting.in @@ -0,0 +1,3 @@ +# specific requirements for the tox coverage env +black +isort diff --git a/dev_requirements/requirements-formatting.txt b/dev_requirements/requirements-formatting.txt new file mode 100644 index 0000000..b9f5aaf --- /dev/null +++ b/dev_requirements/requirements-formatting.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile '.\requirements-formatting.in' +# +black==23.11.0 + # via -r .\requirements-formatting.in +click==8.1.7 + # via black +colorama==0.4.6 + # via click +isort==5.12.0 + # via -r .\requirements-formatting.in +mypy-extensions==1.0.0 + # via black +packaging==23.2 + # via black +pathspec==0.11.2 + # via black +platformdirs==4.1.0 + # via black diff --git a/dev_requirements/requirements-linting.in b/dev_requirements/requirements-linting.in new file mode 100644 index 0000000..ec0eccb --- /dev/null +++ b/dev_requirements/requirements-linting.in @@ -0,0 +1,2 @@ +# specific requirements for the tox coverage env +pylint diff --git a/dev_requirements/requirements-linting.txt b/dev_requirements/requirements-linting.txt new file mode 100644 index 0000000..cd22197 --- /dev/null +++ b/dev_requirements/requirements-linting.txt @@ -0,0 +1,22 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile '.\requirements-linting.in' +# +astroid==3.0.1 + # via pylint +colorama==0.4.6 + # via pylint +dill==0.3.7 + # via pylint +isort==5.12.0 + # via pylint +mccabe==0.7.0 + # via pylint +platformdirs==4.1.0 + # via pylint +pylint==3.0.2 + # via -r .\requirements-linting.in +tomlkit==0.12.3 + # via pylint diff --git a/dev_requirements/requirements-test_packaging.in b/dev_requirements/requirements-test_packaging.in new file mode 100644 index 0000000..4985e43 --- /dev/null +++ b/dev_requirements/requirements-test_packaging.in @@ -0,0 +1,3 @@ +# specific requirements for the tox coverage env +build +twine diff --git a/dev_requirements/requirements-test_packaging.txt b/dev_requirements/requirements-test_packaging.txt new file mode 100644 index 0000000..23a2517 --- /dev/null +++ b/dev_requirements/requirements-test_packaging.txt @@ -0,0 +1,66 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile '.\requirements-test_packaging.in' +# +build==1.0.3 + # via -r .\requirements-test_packaging.in +certifi==2023.11.17 + # via requests +charset-normalizer==3.3.2 + # via requests +colorama==0.4.6 + # via build +docutils==0.20.1 + # via readme-renderer +idna==3.6 + # via requests +importlib-metadata==7.0.0 + # via + # keyring + # twine +jaraco-classes==3.3.0 + # via keyring +keyring==24.3.0 + # via twine +markdown-it-py==3.0.0 + # via rich +mdurl==0.1.2 + # via markdown-it-py +more-itertools==10.1.0 + # via jaraco-classes +nh3==0.2.14 + # via readme-renderer +packaging==23.2 + # via build +pkginfo==1.9.6 + # via twine +pygments==2.17.2 + # via + # readme-renderer + # rich +pyproject-hooks==1.0.0 + # via build +pywin32-ctypes==0.2.2 + # via keyring +readme-renderer==42.0 + # via twine +requests==2.31.0 + # via + # requests-toolbelt + # twine +requests-toolbelt==1.0.0 + # via twine +rfc3986==2.0.0 + # via twine +rich==13.7.0 + # via twine +twine==4.0.2 + # via -r .\requirements-test_packaging.in +urllib3==2.1.0 + # via + # requests + # twine +zipp==3.17.0 + # via importlib-metadata diff --git a/dev_requirements/requirements-tests.in b/dev_requirements/requirements-tests.in new file mode 100644 index 0000000..135819c --- /dev/null +++ b/dev_requirements/requirements-tests.in @@ -0,0 +1,6 @@ +# specific requirements for the tox coverage env +pytest +pytest-datafiles +pytest-mock +pytest-asyncio +aioresponses diff --git a/dev_requirements/requirements-tests.txt b/dev_requirements/requirements-tests.txt new file mode 100644 index 0000000..d53e9cb --- /dev/null +++ b/dev_requirements/requirements-tests.txt @@ -0,0 +1,46 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile '.\dev_requirements\requirements-tests.in' +# +aiohttp==3.9.1 + # via aioresponses +aioresponses==0.7.6 + # via -r .\dev_requirements\requirements-tests.in +aiosignal==1.3.1 + # via aiohttp +attrs==23.1.0 + # via aiohttp +colorama==0.4.6 + # via pytest +frozenlist==1.4.0 + # via + # aiohttp + # aiosignal +idna==3.6 + # via yarl +iniconfig==2.0.0 + # via pytest +multidict==6.0.4 + # via + # aiohttp + # yarl +packaging==23.2 + # via pytest +pluggy==1.3.0 + # via pytest +pytest==7.4.3 + # via + # -r .\dev_requirements\requirements-tests.in + # pytest-asyncio + # pytest-datafiles + # pytest-mock +pytest-asyncio==0.23.0 + # via -r .\dev_requirements\requirements-tests.in +pytest-datafiles==3.0.0 + # via -r .\dev_requirements\requirements-tests.in +pytest-mock==3.12.0 + # via -r .\dev_requirements\requirements-tests.in +yarl==1.9.3 + # via aiohttp diff --git a/dev_requirements/requirements-type_check.in b/dev_requirements/requirements-type_check.in new file mode 100644 index 0000000..13b93bd --- /dev/null +++ b/dev_requirements/requirements-type_check.in @@ -0,0 +1,2 @@ +# specific requirements for the tox coverage env +mypy diff --git a/dev_requirements/requirements-type_check.txt b/dev_requirements/requirements-type_check.txt new file mode 100644 index 0000000..828b8bd --- /dev/null +++ b/dev_requirements/requirements-type_check.txt @@ -0,0 +1,12 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile '.\requirements-type_check.in' +# +mypy==1.7.1 + # via -r .\requirements-type_check.in +mypy-extensions==1.0.0 + # via mypy +typing-extensions==4.8.0 + # via mypy diff --git a/requirements.txt b/requirements.txt index 1f2480a..2b04bcb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,10 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile requirements.in # -aiodns==3.0.0 - # via aiohttp -aiohttp[speedups]==3.8.5 +aiohttp[speedups]==3.9.1 # via # -r requirements.in # aiohttp-requests @@ -14,37 +12,27 @@ aiohttp-requests==0.2.3 # via -r requirements.in aiosignal==1.3.1 # via aiohttp -async-timeout==4.0.2 - # via aiohttp -attrs==22.2.0 +attrs==23.1.0 # via aiohttp beautifulsoup4==4.12.2 # via -r requirements.in brotli==1.1.0 # via aiohttp -cffi==1.15.1 - # via pycares -charset-normalizer==2.1.1 - # via aiohttp coworker==2.0.1 # via aiohttp-requests -frozenlist==1.3.3 +frozenlist==1.4.0 # via # aiohttp # aiosignal -idna==3.3 +idna==3.6 # via yarl multidict==6.0.4 # via # aiohttp # yarl -pycares==4.3.0 - # via aiodns -pycparser==2.21 - # via cffi pypdf==3.17.1 # via -r requirements.in soupsieve==2.3.2.post1 # via beautifulsoup4 -yarl==1.8.2 +yarl==1.9.3 # via aiohttp diff --git a/tox.ini b/tox.ini index 8f21e73..f90fb2e 100644 --- a/tox.ini +++ b/tox.ini @@ -14,11 +14,7 @@ commands = python -m pip install --upgrade pip # the tests environment is called by the Github action that runs the unit tests deps = -rrequirements.txt - pytest - pytest-datafiles - pytest-mock - pytest-asyncio - aioresponses + -r dev_requirements/requirements-tests.txt setenv = PYTHONPATH = {toxinidir}/src commands = python -m pytest --basetemp={envtmpdir} {posargs} @@ -26,7 +22,7 @@ commands = python -m pytest --basetemp={envtmpdir} {posargs} # the linting environment is called by the Github Action that runs the linter deps = -rrequirements.txt - pylint + -r dev_requirements/requirements-linting.txt # add your fixtures like e.g. pytest_datafiles here setenv = PYTHONPATH = {toxinidir}/src commands = @@ -37,7 +33,7 @@ commands = # the type_check environment checks the type hints using mypy deps = -rrequirements.txt - mypy + -r dev_requirements/requirements-type_check.txt commands = mypy --show-error-codes src/edi_energy_scraper # mypy --show-error-codes unittests # does not work yet, sadly; Some tox/packaging problems @@ -47,7 +43,7 @@ commands = # the coverage environment is called by the Github Action that runs the coverage measurement deps = {[testenv:tests]deps} - coverage + -r dev_requirements/requirements-coverage.txt setenv = PYTHONPATH = {toxinidir}/src commands = coverage run -m pytest --basetemp={envtmpdir} {posargs} @@ -62,8 +58,7 @@ deps = {[testenv:linting]deps} {[testenv:type_check]deps} {[testenv:coverage]deps} - black - isort + -r dev_requirements/requirements-formatting.txt pip-tools pre-commit commands = @@ -75,8 +70,7 @@ commands = [testenv:test_packaging] skip_install = true deps = - build - twine + -r dev_requirements/requirements-test_packaging.txt commands = python -m build twine check dist/*