diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index da95dd5b..1a3a9eff 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -22,8 +22,9 @@ jobs: uses: actions/checkout@v4 - name: Check requirements.txt run: | - (diff -w <(grep -v "python_version > '3.7'" python/requirements.txt | sed -e "s/;.*//") python/requirements-3.7.txt || true) | (! grep -e "^<") - (diff -w <(grep -v "python_version <= '3.7'" python/requirements.txt | sed -e "s/;.*//") python/requirements-post-3.7.txt || true) | (! grep -e "^<") + (diff -w <(grep -v -e "python_version > '3.7'" -e "python_version == '3.8'" -e "python_version > '3.8'" python/requirements.txt | sed -e "s/;.*//") python/requirements-3.7.txt || true) | (! grep -e "^<") + (diff -w <(grep -v -e "python_version <= '3.7'" -e "python_version > '3.8'" python/requirements.txt | sed -e "s/;.*//") python/requirements-3.8.txt || true) | (! grep -e "^<") + (diff -w <(grep -v -e "python_version <= '3.7'" -e "python_version == '3.8'" python/requirements.txt | sed -e "s/;.*//") python/requirements-post-3.8.txt || true) | (! grep -e "^<") shell: bash - name: Check for dependency updates continue-on-error: true diff --git a/Dockerfile b/Dockerfile index dc544bda..e92f161a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.8-alpine +FROM python:3.12-alpine LABEL repository="https://github.com/EnricoMi/publish-unit-test-result-action" LABEL homepage="https://github.com/EnricoMi/publish-unit-test-result-action" @@ -11,7 +11,7 @@ LABEL com.github.actions.color="green" RUN apk add --no-cache --upgrade expat libuuid -COPY python/requirements-post-3.7.txt /action/requirements.txt +COPY python/requirements-post-3.8.txt /action/requirements.txt RUN apk add --no-cache build-base libffi-dev; \ pip install --upgrade --force --no-cache-dir pip && \ pip install --upgrade --force --no-cache-dir -r /action/requirements.txt; \ diff --git a/composite/action.yml b/composite/action.yml index 938f950e..ce7641c0 100644 --- a/composite/action.yml +++ b/composite/action.yml @@ -183,11 +183,12 @@ runs: echo "PYTHON_BIN=$PYTHON_BIN" >> "$GITHUB_ENV" PYTHON_VERSION="$($PYTHON_BIN -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" - if [[ "$PYTHON_VERSION" == "3.7" ]] - then + if [[ "$PYTHON_VERSION" == "3.7" ]]; then echo "DEPENDENCIES_VERSION=3.7" >> "$GITHUB_ENV" + elif [[ "$PYTHON_VERSION" == "3.8" ]]; then + echo "DEPENDENCIES_VERSION=3.8" >> "$GITHUB_ENV" else - echo "DEPENDENCIES_VERSION=post-3.7" >> "$GITHUB_ENV" + echo "DEPENDENCIES_VERSION=post-3.8" >> "$GITHUB_ENV" fi echo "version=$PYTHON_VERSION" >> "$GITHUB_OUTPUT" @@ -218,7 +219,7 @@ runs: continue-on-error: true with: path: ${{ steps.os.outputs.pip-cache }} - key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-1a7833c49f5935a970bc661e3c45aa2a + key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-b0048519e3287ae9cfc634aeda40cbfe - name: Create virtualenv id: venv diff --git a/linux/action.yml b/linux/action.yml index 59cacbad..43c951df 100644 --- a/linux/action.yml +++ b/linux/action.yml @@ -177,11 +177,12 @@ runs: echo "PYTHON_BIN=$PYTHON_BIN" >> "$GITHUB_ENV" PYTHON_VERSION="$($PYTHON_BIN -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" - if [[ "$PYTHON_VERSION" == "3.7" ]] - then + if [[ "$PYTHON_VERSION" == "3.7" ]]; then echo "DEPENDENCIES_VERSION=3.7" >> "$GITHUB_ENV" + elif [[ "$PYTHON_VERSION" == "3.8" ]]; then + echo "DEPENDENCIES_VERSION=3.8" >> "$GITHUB_ENV" else - echo "DEPENDENCIES_VERSION=post-3.7" >> "$GITHUB_ENV" + echo "DEPENDENCIES_VERSION=post-3.8" >> "$GITHUB_ENV" fi echo "version=$PYTHON_VERSION" >> "$GITHUB_OUTPUT" @@ -194,7 +195,7 @@ runs: continue-on-error: true with: path: '~/.cache/pip' - key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-1a7833c49f5935a970bc661e3c45aa2a + key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-b0048519e3287ae9cfc634aeda40cbfe - name: Create virtualenv id: venv diff --git a/macos/action.yml b/macos/action.yml index af0acdf0..fef99533 100644 --- a/macos/action.yml +++ b/macos/action.yml @@ -177,11 +177,12 @@ runs: echo "PYTHON_BIN=$PYTHON_BIN" >> "$GITHUB_ENV" PYTHON_VERSION="$($PYTHON_BIN -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" - if [[ "$PYTHON_VERSION" == "3.7" ]] - then + if [[ "$PYTHON_VERSION" == "3.7" ]]; then echo "DEPENDENCIES_VERSION=3.7" >> "$GITHUB_ENV" + elif [[ "$PYTHON_VERSION" == "3.8" ]]; then + echo "DEPENDENCIES_VERSION=3.8" >> "$GITHUB_ENV" else - echo "DEPENDENCIES_VERSION=post-3.7" >> "$GITHUB_ENV" + echo "DEPENDENCIES_VERSION=post-3.8" >> "$GITHUB_ENV" fi echo "version=$PYTHON_VERSION" >> "$GITHUB_OUTPUT" @@ -194,7 +195,7 @@ runs: continue-on-error: true with: path: '~/Library/Caches/pip' - key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-1a7833c49f5935a970bc661e3c45aa2a + key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-b0048519e3287ae9cfc634aeda40cbfe - name: Create virtualenv id: venv diff --git a/python/requirements-3.10.txt b/python/requirements-3.10.txt index 2b60dc2f..163f415b 100644 --- a/python/requirements-3.10.txt +++ b/python/requirements-3.10.txt @@ -1,18 +1,18 @@ -humanize==4.9.0 -junitparser==3.1.2 +humanize==4.11.0 +junitparser==3.2.0 lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 +psutil==6.1.0 +PyGithub==2.4.0 Deprecated==1.2.14 wrapt==1.16.0 - PyJWT==2.8.0 + PyJWT==2.9.0 PyNaCl==1.5.0 cffi==1.17.1 pycparser==2.22 requests==2.32.3 - certifi==2024.7.4 - charset-normalizer==3.3.2 - idna==3.7 - urllib3==2.2.2 + certifi==2024.8.30 + charset-normalizer==3.4.0 + idna==3.10 + urllib3==2.2.3 typing_extensions==4.12.2 - urllib3==2.2.2 + urllib3==2.2.3 diff --git a/python/requirements-3.11.txt b/python/requirements-3.11.txt index 2b60dc2f..163f415b 100644 --- a/python/requirements-3.11.txt +++ b/python/requirements-3.11.txt @@ -1,18 +1,18 @@ -humanize==4.9.0 -junitparser==3.1.2 +humanize==4.11.0 +junitparser==3.2.0 lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 +psutil==6.1.0 +PyGithub==2.4.0 Deprecated==1.2.14 wrapt==1.16.0 - PyJWT==2.8.0 + PyJWT==2.9.0 PyNaCl==1.5.0 cffi==1.17.1 pycparser==2.22 requests==2.32.3 - certifi==2024.7.4 - charset-normalizer==3.3.2 - idna==3.7 - urllib3==2.2.2 + certifi==2024.8.30 + charset-normalizer==3.4.0 + idna==3.10 + urllib3==2.2.3 typing_extensions==4.12.2 - urllib3==2.2.2 + urllib3==2.2.3 diff --git a/python/requirements-3.12.txt b/python/requirements-3.12.txt index 2b60dc2f..163f415b 100644 --- a/python/requirements-3.12.txt +++ b/python/requirements-3.12.txt @@ -1,18 +1,18 @@ -humanize==4.9.0 -junitparser==3.1.2 +humanize==4.11.0 +junitparser==3.2.0 lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 +psutil==6.1.0 +PyGithub==2.4.0 Deprecated==1.2.14 wrapt==1.16.0 - PyJWT==2.8.0 + PyJWT==2.9.0 PyNaCl==1.5.0 cffi==1.17.1 pycparser==2.22 requests==2.32.3 - certifi==2024.7.4 - charset-normalizer==3.3.2 - idna==3.7 - urllib3==2.2.2 + certifi==2024.8.30 + charset-normalizer==3.4.0 + idna==3.10 + urllib3==2.2.3 typing_extensions==4.12.2 - urllib3==2.2.2 + urllib3==2.2.3 diff --git a/python/requirements-3.13.txt b/python/requirements-3.13.txt index 2b60dc2f..163f415b 100644 --- a/python/requirements-3.13.txt +++ b/python/requirements-3.13.txt @@ -1,18 +1,18 @@ -humanize==4.9.0 -junitparser==3.1.2 +humanize==4.11.0 +junitparser==3.2.0 lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 +psutil==6.1.0 +PyGithub==2.4.0 Deprecated==1.2.14 wrapt==1.16.0 - PyJWT==2.8.0 + PyJWT==2.9.0 PyNaCl==1.5.0 cffi==1.17.1 pycparser==2.22 requests==2.32.3 - certifi==2024.7.4 - charset-normalizer==3.3.2 - idna==3.7 - urllib3==2.2.2 + certifi==2024.8.30 + charset-normalizer==3.4.0 + idna==3.10 + urllib3==2.2.3 typing_extensions==4.12.2 - urllib3==2.2.2 + urllib3==2.2.3 diff --git a/python/requirements-3.7.txt b/python/requirements-3.7.txt index 27a8d3d3..8bfbf9bf 100644 --- a/python/requirements-3.7.txt +++ b/python/requirements-3.7.txt @@ -2,10 +2,10 @@ humanize==4.6.0 importlib-metadata==6.7.0 typing_extensions==4.7.1 zipp==3.15.0 -junitparser==3.1.2 +junitparser==3.2.0 lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 +psutil==6.1.0 +PyGithub==2.3.0 Deprecated==1.2.14 wrapt==1.16.0 PyJWT==2.8.0 @@ -14,9 +14,9 @@ PyGithub==2.2.0 cffi==1.15.1 pycparser==2.21 requests==2.31.0 - certifi==2024.7.4 - charset-normalizer==3.3.2 - idna==3.7 + certifi==2024.8.30 + charset-normalizer==3.4.0 + idna==3.10 urllib3==2.0.7 typing_extensions==4.7.1 urllib3==2.0.7 diff --git a/python/requirements-3.8.txt b/python/requirements-3.8.txt index 2b60dc2f..dfed9c45 100644 --- a/python/requirements-3.8.txt +++ b/python/requirements-3.8.txt @@ -1,18 +1,18 @@ -humanize==4.9.0 -junitparser==3.1.2 +humanize==4.10.0 +junitparser==3.2.0 lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 +psutil==6.1.0 +PyGithub==2.4.0 Deprecated==1.2.14 wrapt==1.16.0 - PyJWT==2.8.0 + PyJWT==2.9.0 PyNaCl==1.5.0 cffi==1.17.1 pycparser==2.22 requests==2.32.3 - certifi==2024.7.4 - charset-normalizer==3.3.2 - idna==3.7 - urllib3==2.2.2 + certifi==2024.8.30 + charset-normalizer==3.4.0 + idna==3.10 + urllib3==2.2.3 typing_extensions==4.12.2 - urllib3==2.2.2 + urllib3==2.2.3 diff --git a/python/requirements-3.9.txt b/python/requirements-3.9.txt index 2b60dc2f..163f415b 100644 --- a/python/requirements-3.9.txt +++ b/python/requirements-3.9.txt @@ -1,18 +1,18 @@ -humanize==4.9.0 -junitparser==3.1.2 +humanize==4.11.0 +junitparser==3.2.0 lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 +psutil==6.1.0 +PyGithub==2.4.0 Deprecated==1.2.14 wrapt==1.16.0 - PyJWT==2.8.0 + PyJWT==2.9.0 PyNaCl==1.5.0 cffi==1.17.1 pycparser==2.22 requests==2.32.3 - certifi==2024.7.4 - charset-normalizer==3.3.2 - idna==3.7 - urllib3==2.2.2 + certifi==2024.8.30 + charset-normalizer==3.4.0 + idna==3.10 + urllib3==2.2.3 typing_extensions==4.12.2 - urllib3==2.2.2 + urllib3==2.2.3 diff --git a/python/requirements-post-3.7.txt b/python/requirements-post-3.7.txt deleted file mode 100644 index 2b60dc2f..00000000 --- a/python/requirements-post-3.7.txt +++ /dev/null @@ -1,18 +0,0 @@ -humanize==4.9.0 -junitparser==3.1.2 -lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 - Deprecated==1.2.14 - wrapt==1.16.0 - PyJWT==2.8.0 - PyNaCl==1.5.0 - cffi==1.17.1 - pycparser==2.22 - requests==2.32.3 - certifi==2024.7.4 - charset-normalizer==3.3.2 - idna==3.7 - urllib3==2.2.2 - typing_extensions==4.12.2 - urllib3==2.2.2 diff --git a/python/requirements-post-3.8.txt b/python/requirements-post-3.8.txt new file mode 100644 index 00000000..163f415b --- /dev/null +++ b/python/requirements-post-3.8.txt @@ -0,0 +1,18 @@ +humanize==4.11.0 +junitparser==3.2.0 +lxml==5.3.0 +psutil==6.1.0 +PyGithub==2.4.0 + Deprecated==1.2.14 + wrapt==1.16.0 + PyJWT==2.9.0 + PyNaCl==1.5.0 + cffi==1.17.1 + pycparser==2.22 + requests==2.32.3 + certifi==2024.8.30 + charset-normalizer==3.4.0 + idna==3.10 + urllib3==2.2.3 + typing_extensions==4.12.2 + urllib3==2.2.3 diff --git a/python/requirements.txt b/python/requirements.txt index be04fbc3..d81b3c2f 100644 --- a/python/requirements.txt +++ b/python/requirements.txt @@ -1,6 +1,8 @@ humanize==4.6.0; python_version <= '3.7' -humanize==4.9.0; python_version > '3.7' -junitparser==3.1.2 +humanize==4.10.0; python_version == '3.8' +humanize==4.11.0; python_version > '3.8' +junitparser==3.2.0 lxml==5.3.0 -psutil==5.9.8 -PyGithub==2.2.0 +psutil==6.1.0 +PyGithub==2.3.0; python_version <= '3.7' +PyGithub==2.4.0; python_version > '3.7' diff --git a/tox.ini b/tox.ini index 2c92a58a..37c93076 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{37,38,39,310,311,312} +envlist = py{37,38,39,310,311,312,313} [testenv] commands = .github/upgrade-pip-packages.sh diff --git a/windows/action.yml b/windows/action.yml index da3bbe66..4d42b8f4 100644 --- a/windows/action.yml +++ b/windows/action.yml @@ -178,8 +178,10 @@ runs: if ( $PYTHON_VERSION -eq "3.7" ) { "DEPENDENCIES_VERSION=3.7" | Out-File -FilePath $env:GITHUB_ENV -Append + } elseif ( $PYTHON_VERSION -eq "3.8" ) { + "DEPENDENCIES_VERSION=3.8" | Out-File -FilePath $env:GITHUB_ENV -Append } else { - "DEPENDENCIES_VERSION=post-3.7" | Out-File -FilePath $env:GITHUB_ENV -Append + "DEPENDENCIES_VERSION=post-3.8" | Out-File -FilePath $env:GITHUB_ENV -Append } "version=$PYTHON_VERSION" | Out-File -FilePath $env:GITHUB_OUTPUT -Append } finally { @@ -193,7 +195,7 @@ runs: continue-on-error: true with: path: '~\AppData\Local\pip\Cache' - key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-1a7833c49f5935a970bc661e3c45aa2a + key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-b0048519e3287ae9cfc634aeda40cbfe - name: Create virtualenv id: venv diff --git a/windows/bash/action.yml b/windows/bash/action.yml index 32001640..9d485304 100644 --- a/windows/bash/action.yml +++ b/windows/bash/action.yml @@ -177,11 +177,12 @@ runs: echo "PYTHON_BIN=$PYTHON_BIN" >> "$GITHUB_ENV" PYTHON_VERSION="$("$PYTHON_BIN" -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')" - if [[ "$PYTHON_VERSION" == "3.7" ]] - then + if [[ "$PYTHON_VERSION" == "3.7" ]]; then echo "DEPENDENCIES_VERSION=3.7" >> "$GITHUB_ENV" + elif [[ "$PYTHON_VERSION" == "3.8" ]]; then + echo "DEPENDENCIES_VERSION=3.8" >> "$GITHUB_ENV" else - echo "DEPENDENCIES_VERSION=post-3.7" >> "$GITHUB_ENV" + echo "DEPENDENCIES_VERSION=post-3.8" >> "$GITHUB_ENV" fi echo "version=$PYTHON_VERSION" >> "$GITHUB_OUTPUT" @@ -194,7 +195,7 @@ runs: continue-on-error: true with: path: '~\AppData\Local\pip\Cache' - key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-1a7833c49f5935a970bc661e3c45aa2a + key: enricomi-publish-action-${{ runner.os }}-${{ runner.arch }}-pip-${{ steps.python.outputs.version }}-b0048519e3287ae9cfc634aeda40cbfe - name: Create virtualenv id: venv