diff --git a/.github/workflows/pythonlint.yml b/.github/workflows/pythonlint.yml index aeee3e48..9a58230f 100644 --- a/.github/workflows/pythonlint.yml +++ b/.github/workflows/pythonlint.yml @@ -9,7 +9,7 @@ jobs: matrix: python-version: [ "3.12" ] os: [ ubuntu-latest ] - linter-env: [ "linting", "type_check", "dev" ] + linter-env: [ "linting", "type_check" ] steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} diff --git a/dev_requirements/requirements-coverage.txt b/dev_requirements/requirements-coverage.txt index 2c183ef6..8565fe32 100644 --- a/dev_requirements/requirements-coverage.txt +++ b/dev_requirements/requirements-coverage.txt @@ -1,9 +1,8 @@ -# SHA1:6dafbcf610e9f81897b65ee9142715ab2e793f9e # -# 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 '.\requirements-coverage.in' # coverage==7.4.4 - # via -r dev_requirements\requirements-coverage.in + # via -r dev_requirements/requirements-coverage.in diff --git a/dev_requirements/requirements-formatting.txt b/dev_requirements/requirements-formatting.txt index fcff5b06..e231a1e7 100644 --- a/dev_requirements/requirements-formatting.txt +++ b/dev_requirements/requirements-formatting.txt @@ -1,23 +1,20 @@ -# SHA1:2c7ffcd29222de3114c7f7994911f1b69d06b6b3 # -# 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 requirements-formatting.in # black==24.3.0 - # via -r dev_requirements\requirements-formatting.in + # via -r dev_requirements/requirements-formatting.in click==8.1.7 # via black -colorama==0.4.6 - # via click isort==5.13.2 - # via -r dev_requirements\requirements-formatting.in + # via -r dev_requirements/requirements-formatting.in mypy-extensions==1.0.0 # via black -packaging==24.0 +packaging==23.2 # via black pathspec==0.12.1 # via black -platformdirs==4.2.0 +platformdirs==4.1.0 # via black diff --git a/dev_requirements/requirements-linting.txt b/dev_requirements/requirements-linting.txt index 600186a7..9172005a 100644 --- a/dev_requirements/requirements-linting.txt +++ b/dev_requirements/requirements-linting.txt @@ -1,23 +1,20 @@ -# SHA1:0e15f8789b9d62fe90d1f1b0b6a7e32f13b99b19 # -# 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 '.\requirements-linting.in' # astroid==3.1.0 # via pylint -colorama==0.4.6 - # via pylint -dill==0.3.8 +dill==0.3.7 # via pylint isort==5.13.2 # via pylint mccabe==0.7.0 # via pylint -platformdirs==4.2.0 +platformdirs==3.10.0 # via pylint pylint==3.1.0 - # via -r dev_requirements\requirements-linting.in + # via -r dev_requirements/requirements-linting.in tomlkit==0.12.4 # via pylint diff --git a/dev_requirements/requirements-test_packaging.txt b/dev_requirements/requirements-test_packaging.txt index 03805662..cef51a7e 100644 --- a/dev_requirements/requirements-test_packaging.txt +++ b/dev_requirements/requirements-test_packaging.txt @@ -1,32 +1,35 @@ -# SHA1:93e4fbf2b6cce1574fe3d5315360512fa9927699 # -# This file is autogenerated by pip-compile-multi -# To update, run: +# This file is autogenerated by pip-compile with Python 3.12 +# by the following command: # -# pip-compile-multi +# pip-compile dev_requirements/requirements-test_packaging.in # build==1.1.1 - # via -r dev_requirements\requirements-test_packaging.in + # via -r dev_requirements/requirements-test_packaging.in certifi==2024.2.2 # via requests +cffi==1.16.0 + # via cryptography charset-normalizer==3.3.2 # via requests -colorama==0.4.6 - # via build +cryptography==42.0.5 + # via secretstorage docutils==0.20.1 # via readme-renderer idna==3.6 # via requests importlib-metadata==7.1.0 - # via - # keyring - # twine + # via twine jaraco-classes==3.3.1 # via keyring jaraco-context==4.3.0 # via keyring jaraco-functools==4.0.0 # via keyring +jeepney==0.8.0 + # via + # keyring + # secretstorage keyring==25.0.0 # via twine markdown-it-py==3.0.0 @@ -37,20 +40,20 @@ more-itertools==10.2.0 # via # jaraco-classes # jaraco-functools -nh3==0.2.17 +nh3==0.2.15 # via readme-renderer packaging==24.0 # via build pkginfo==1.10.0 # via twine +pycparser==2.21 + # via cffi pygments==2.17.2 # via # readme-renderer # rich pyproject-hooks==1.0.0 # via build -pywin32-ctypes==0.2.2 - # via keyring readme-renderer==43.0 # via twine requests==2.31.0 @@ -63,8 +66,10 @@ rfc3986==2.0.0 # via twine rich==13.7.1 # via twine +secretstorage==3.3.3 + # via keyring twine==5.0.0 - # via -r dev_requirements\requirements-test_packaging.in + # via -r dev_requirements/requirements-test_packaging.in urllib3==2.2.1 # via # requests diff --git a/dev_requirements/requirements-tests.txt b/dev_requirements/requirements-tests.txt index c6d61804..94935cc7 100644 --- a/dev_requirements/requirements-tests.txt +++ b/dev_requirements/requirements-tests.txt @@ -1,23 +1,20 @@ -# SHA1:d8bf34f7830b949c538f22e73d2b6ebb2065a573 # -# 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 '.\requirements-tests.in' # -colorama==0.4.6 - # via pytest dictdiffer==0.9.0 - # via -r dev_requirements\requirements-tests.in + # via -r dev_requirements/requirements-tests.in iniconfig==2.0.0 # via pytest -packaging==24.0 +packaging==22.0 # via pytest pluggy==1.4.0 # via pytest pytest==8.1.1 # via - # -r dev_requirements\requirements-tests.in + # -r dev_requirements/requirements-tests.in # pytest-datafiles pytest-datafiles==3.0.0 - # via -r dev_requirements\requirements-tests.in + # via -r dev_requirements/requirements-tests.in diff --git a/dev_requirements/requirements-type_check.txt b/dev_requirements/requirements-type_check.txt index 2d46d468..bdecc0bc 100644 --- a/dev_requirements/requirements-type_check.txt +++ b/dev_requirements/requirements-type_check.txt @@ -1,49 +1,46 @@ -# SHA1:9cd1f3c474cd703c73c638f1d80652561b103054 # -# 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 '.\requirements-type_check.in' # -colorama==0.4.6 - # via pytest iniconfig==2.0.0 # via pytest mypy==1.9.0 - # via -r dev_requirements\requirements-type_check.in + # via -r dev_requirements/requirements-type_check.in mypy-extensions==1.0.0 # via mypy -networkx==3.2.1 +networkx==3.1 # via networkx-stubs networkx-stubs==0.0.1 - # via -r dev_requirements\requirements-type_check.in -numpy==1.26.4 + # via -r dev_requirements/requirements-type_check.in +numpy==1.26.2 # via # pandas # pandas-stubs -packaging==24.0 +packaging==22.0 # via pytest pandas==2.2.1 - # via -r dev_requirements\requirements-type_check.in + # via -r dev_requirements/requirements-type_check.in pandas-stubs==2.2.1.240316 - # via -r dev_requirements\requirements-type_check.in + # via -r dev_requirements/requirements-type_check.in pluggy==1.4.0 # via pytest pytest==8.1.1 - # via -r dev_requirements\requirements-type_check.in -python-dateutil==2.9.0.post0 + # via -r dev_requirements/requirements-type_check.in +python-dateutil==2.8.2 # via pandas pytz==2024.1 # via pandas six==1.16.0 # via python-dateutil -types-pytz==2024.1.0.20240203 +types-pytz==2023.3.1.1 # via pandas-stubs types-requests==2.31.0.20240311 - # via -r dev_requirements\requirements-type_check.in -typing-extensions==4.10.0 + # via -r dev_requirements/requirements-type_check.in +typing-extensions==4.8.0 # via mypy -tzdata==2024.1 +tzdata==2023.3 # via pandas -urllib3==2.2.1 +urllib3==2.1.0 # via types-requests diff --git a/requirements.txt b/requirements.txt index 7b492649..c09bec51 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,31 +10,27 @@ attrs==23.2.0 # maus click==8.1.7 # via -r requirements.in -colorama==0.4.6 - # via - # click - # colorlog colorlog==6.8.2 # via -r requirements.in et-xmlfile==1.1.0 # via openpyxl -lxml==5.1.0 +lxml==4.9.3 # via python-docx -marshmallow==3.21.1 +marshmallow==3.19.0 # via maus maus==0.4.2 # via -r requirements.in -more-itertools==10.2.0 +more-itertools==9.0.0 # via maus -numpy==1.26.4 +numpy==1.26.2 # via pandas openpyxl==3.1.2 # via -r requirements.in -packaging==24.0 +packaging==22.0 # via marshmallow pandas==2.2.1 # via -r requirements.in -python-dateutil==2.9.0.post0 +python-dateutil==2.8.2 # via pandas python-docx==1.1.0 # via -r requirements.in @@ -44,9 +40,9 @@ six==1.16.0 # via python-dateutil tomlkit==0.12.4 # via -r requirements.in -typing-extensions==4.10.0 +typing-extensions==4.8.0 # via python-docx -tzdata==2024.1 +tzdata==2023.3 # via pandas xlsxwriter==3.2.0 # via -r requirements.in diff --git a/tox.ini b/tox.ini index ba022746..56fbd360 100644 --- a/tox.ini +++ b/tox.ini @@ -64,9 +64,9 @@ deps = pre-commit commands = python -m pip install --upgrade pip - # pip-compile requirements.in + pip-compile requirements.in pip install -r requirements.txt - # pre-commit install + pre-commit install [testenv:test_packaging] skip_install = true