diff --git a/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml b/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml index 4bde1aad..bfeb2c8c 100644 --- a/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml +++ b/.github/workflows/_reusable-update-python-and-pre-commit-dependencies.yml @@ -18,7 +18,7 @@ on: Use an empty string, e.g. "", for dependencies located in the default group' required: false type: string - default: '' + default: '{}' update-pre-commit: description: A boolean indicating if the pre-commit hooks should be updated. required: false diff --git a/.github/workflows/update-python-dependencies.yml b/.github/workflows/update-python-dependencies.yml index de88bcbe..90a4abda 100644 --- a/.github/workflows/update-python-dependencies.yml +++ b/.github/workflows/update-python-dependencies.yml @@ -12,10 +12,12 @@ jobs: export-groups: ${{ steps.set-output.outputs.export-groups }} steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + with: + fetch-depth: 0 - name: Get commit message id: get-commit-message run: | - commit_message="$(git log -2 --pretty=%B | sed -n '2p')" + commit_message="$(git log --grep='chore(python-deps):' -1 --pretty=%B)" echo "commit-message=$commit_message" >> "$GITHUB_OUTPUT" - name: Determine the groups that will need to be exported id: set-output @@ -31,9 +33,6 @@ jobs: if [[ "$commit_message" == *"find_unreleased_changelog_items"* ]]; then export_groups+="find_unreleased_changelog_items:actions/find_unreleased_changelog_items," fi - if [[ "$commit_message" == *"tests"* ]]; then - export_groups+="tests," - fi if [[ "$commit_message" == *"docs"* ]]; then export_groups+="docs:doc_config," fi diff --git a/actions/create_unique_testpypi_version/requirements.txt b/actions/create_unique_testpypi_version/requirements.txt index 3bff657e..325136ff 100644 --- a/actions/create_unique_testpypi_version/requirements.txt +++ b/actions/create_unique_testpypi_version/requirements.txt @@ -1,7 +1,7 @@ annotated-types==0.7.0 ; python_version >= "3.12" and python_version < "3.13" attrs==24.2.0 ; python_version >= "3.12" and python_version < "3.13" beautifulsoup4==4.12.3 ; python_version >= "3.12" and python_version < "3.13" -certifi==2024.7.4 ; python_version >= "3.12" and python_version < "3.13" +certifi==2024.8.30 ; python_version >= "3.12" and python_version < "3.13" charset-normalizer==3.3.2 ; python_version >= "3.12" and python_version < "3.13" idna==3.8 ; python_version >= "3.12" and python_version < "3.13" mailbits==0.2.1 ; python_version >= "3.12" and python_version < "3.13" diff --git a/actions/update_development_dependencies/action.yml b/actions/update_development_dependencies/action.yml index 91f020a3..83462185 100644 --- a/actions/update_development_dependencies/action.yml +++ b/actions/update_development_dependencies/action.yml @@ -18,7 +18,7 @@ inputs: to update within that group, e.g. {"dev": ["pylint", "ruff"], "tests": ["ruff"]}. Use an empty string, e.g. "", for dependencies located in the default group' required: false - default: '' + default: '{}' update-pre-commit: description: A boolean indicating if the pre-commit hooks should be updated. required: false diff --git a/pyproject.toml b/pyproject.toml index a5abb8a9..bd02db16 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,7 +35,7 @@ python = "~3.12" # This needs to stay in sync with all CI workflows [tool.poetry.group.create_unique_testpypi_version.dependencies] poetry-core = "1.9.0" pypi-simple = "1.5.0" -tomli = "2.0.0" +tomli = "2.0.1" tomli-w = "1.0.0" [tool.poetry.group.dev.dependencies] @@ -209,18 +209,12 @@ commands = [testenv:tests] basepython = python -deps = - -r tests/requirements.txt - -r actions/create_unique_testpypi_version/requirements.txt - -r actions/find_unreleased_changelog_items/requirements.txt - -r actions/update_development_dependencies/requirements.txt passenv = pytest_report_title setenv = pytest_github_report = true pytest_use_blanks = true GITHUB_STEP_SUMMARY = {tox_root}/.results_{envname}/github_report.md -commands_pre = [testenv:docs] deps = @@ -231,13 +225,6 @@ commands = mkdocs --verbose build --site-dir .results_{envname} [testenv:doctests] -deps = - -r doc_config/requirements.txt - -r tests/requirements.txt - -r actions/create_unique_testpypi_version/requirements.txt - -r actions/find_unreleased_changelog_items/requirements.txt - -r actions/update_development_dependencies/requirements.txt -commands_pre = commands = pytest -v -k "test_docs" --showlocals --junitxml={tox_root}/.results_{envname}/results.xml --self-contained-html --html={tox_root}/.results_{envname}/results.html """ diff --git a/tests/requirements.txt b/tests/requirements.txt deleted file mode 100644 index 1ada5200..00000000 --- a/tests/requirements.txt +++ /dev/null @@ -1,40 +0,0 @@ -beautifulsoup4==4.12.3 ; python_version >= "3.12" and python_version < "3.13" -certifi==2024.7.4 ; python_version >= "3.12" and python_version < "3.13" -chardet==5.2.0 ; python_version >= "3.12" and python_version < "3.13" -charset-normalizer==3.3.2 ; python_version >= "3.12" and python_version < "3.13" -colorama==0.4.6 ; python_version >= "3.12" and python_version < "3.13" -coverage==7.6.1 ; python_version >= "3.12" and python_version < "3.13" -coverage[toml]==7.6.1 ; python_version >= "3.12" and python_version < "3.13" -dataproperty==1.0.1 ; python_version >= "3.12" and python_version < "3.13" -dnspython==2.6.1 ; python_version >= "3.12" and python_version < "3.13" -future-fstrings==1.2.0 ; python_version >= "3.12" and python_version < "3.13" -idna==3.8 ; python_version >= "3.12" and python_version < "3.13" -iniconfig==2.0.0 ; python_version >= "3.12" and python_version < "3.13" -jinja2==3.1.4 ; python_version >= "3.12" and python_version < "3.13" -linkchecker==10.4.0 ; python_version >= "3.12" and python_version < "3.13" -markupsafe==2.1.5 ; python_version >= "3.12" and python_version < "3.13" -mbstrdecoder==1.1.3 ; python_version >= "3.12" and python_version < "3.13" -networkx==3.3 ; python_version >= "3.12" and python_version < "3.13" -packaging==24.1 ; python_version >= "3.12" and python_version < "3.13" -pathvalidate==3.2.1 ; python_version >= "3.12" and python_version < "3.13" -pluggy==1.5.0 ; python_version >= "3.12" and python_version < "3.13" -pytablewriter==1.2.0 ; python_version >= "3.12" and python_version < "3.13" -pytest==8.3.2 ; python_version >= "3.12" and python_version < "3.13" -pytest-cov==5.0.0 ; python_version >= "3.12" and python_version < "3.13" -pytest-depends==1.0.1 ; python_version >= "3.12" and python_version < "3.13" -pytest-env==1.1.3 ; python_version >= "3.12" and python_version < "3.13" -pytest-github-report==0.0.1 ; python_version >= "3.12" and python_version < "3.13" -pytest-html==4.1.1 ; python_version >= "3.12" and python_version < "3.13" -pytest-metadata==3.1.1 ; python_version >= "3.12" and python_version < "3.13" -pytest-order==1.3.0 ; python_version >= "3.12" and python_version < "3.13" -python-dateutil==2.9.0.post0 ; python_version >= "3.12" and python_version < "3.13" -pytz==2024.1 ; python_version >= "3.12" and python_version < "3.13" -requests==2.32.3 ; python_version >= "3.12" and python_version < "3.13" -setuptools==74.0.0 ; python_version >= "3.12" and python_version < "3.13" -six==1.16.0 ; python_version >= "3.12" and python_version < "3.13" -soupsieve==2.6 ; python_version >= "3.12" and python_version < "3.13" -tabledata==1.3.3 ; python_version >= "3.12" and python_version < "3.13" -tcolorpy==0.1.6 ; python_version >= "3.12" and python_version < "3.13" -typepy==1.3.2 ; python_version >= "3.12" and python_version < "3.13" -typepy[datetime]==1.3.2 ; python_version >= "3.12" and python_version < "3.13" -urllib3==2.2.2 ; python_version >= "3.12" and python_version < "3.13"