Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Python dependencies #632

Merged
merged 2 commits into from
Oct 21, 2024
Merged

Upgrade Python dependencies #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b445e86
Upgrade dependencies
EnricoMi Oct 21, 2024
53912c5
Upgrade Python in Docker image to 3.12
EnricoMi Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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; \
Expand Down
9 changes: 5 additions & 4 deletions composite/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions linux/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
Expand Down
9 changes: 5 additions & 4 deletions macos/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
Expand Down
20 changes: 10 additions & 10 deletions python/requirements-3.10.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 10 additions & 10 deletions python/requirements-3.11.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 10 additions & 10 deletions python/requirements-3.12.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 10 additions & 10 deletions python/requirements-3.13.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions python/requirements-3.7.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
20 changes: 10 additions & 10 deletions python/requirements-3.8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
20 changes: 10 additions & 10 deletions python/requirements-3.9.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
18 changes: 0 additions & 18 deletions python/requirements-post-3.7.txt
View file
Open in desktop

This file was deleted.

18 changes: 18 additions & 0 deletions python/requirements-post-3.8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 6 additions & 4 deletions python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 4 additions & 2 deletions windows/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down
Loading
Loading