From 138a07122b33251cf1d0cdadecb5e7c128a7e0d8 Mon Sep 17 00:00:00 2001 From: Robert Steiner Date: Thu, 23 May 2024 11:49:15 +0200 Subject: [PATCH 1/2] ci(*:skip) Upgrade pip and setuptools Signed-off-by: Robert Steiner --- .devcontainer/Dockerfile | 4 ++-- .github/actions/bootstrap/action.yml | 6 +++--- baselines/flwr_baselines/dev/bootstrap.sh | 4 ++-- dev/bootstrap.sh | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 03849995735..ce4f8a1a5b8 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -29,8 +29,8 @@ RUN apt-get install -y curl wget gnupg python3 python-is-python3 python3-pip git build-essential tmux vim RUN python -m pip install \ - pip==23.3.1 \ - setuptools==68.2.2 \ + pip==24.0.0 \ + setuptools==69.5.1 \ poetry==1.7.1 USER $USERNAME diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml index 8527f1f8230..bee90beffa7 100644 --- a/.github/actions/bootstrap/action.yml +++ b/.github/actions/bootstrap/action.yml @@ -6,17 +6,17 @@ inputs: default: 3.8 pip-version: description: "Version of pip to be installed using pip" - default: 23.3.1 + default: 24.0.0 setuptools-version: description: "Version of setuptools to be installed using pip" - default: 68.2.2 + default: 69.5.1 poetry-version: description: "Version of poetry to be installed using pip" default: 1.7.1 poetry-skip: description: "Option to skip the poetry installation" required: false - default: 'false' + default: "false" outputs: python-version: description: "Version range or exact version of Python or PyPy" diff --git a/baselines/flwr_baselines/dev/bootstrap.sh b/baselines/flwr_baselines/dev/bootstrap.sh index a2f3080a82f..5cb1792a282 100755 --- a/baselines/flwr_baselines/dev/bootstrap.sh +++ b/baselines/flwr_baselines/dev/bootstrap.sh @@ -6,8 +6,8 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../ ./dev/rm-caches.sh # Upgrade/install spcific versions of `pip`, `setuptools`, and `poetry` -python -m pip install -U pip==23.3.1 -python -m pip install -U setuptools==68.2.2 +python -m pip install -U pip==24.0.0 +python -m pip install -U setuptools==69.5.1 python -m pip install -U poetry==1.7.1 # Use `poetry` to install project dependencies diff --git a/dev/bootstrap.sh b/dev/bootstrap.sh index b4bb82d73b5..154fe0f1cba 100755 --- a/dev/bootstrap.sh +++ b/dev/bootstrap.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../ +cd "$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"/../ # Setup environment variables for development ./dev/setup-envs.sh @@ -9,8 +9,8 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../ ./dev/rm-caches.sh # Upgrade/install spcific versions of `pip`, `setuptools`, and `poetry` -python -m pip install -U pip==23.3.1 -python -m pip install -U setuptools==68.2.2 +python -m pip install -U pip==24.0.0 +python -m pip install -U setuptools==69.5.1 python -m pip install -U poetry==1.7.1 # Use `poetry` to install project dependencies From c8463d72d7c04fcd5aa1ab7e461145959567249d Mon Sep 17 00:00:00 2001 From: Chong Shen Ng Date: Thu, 23 May 2024 11:19:41 +0100 Subject: [PATCH 2/2] Revert versions in bootstrap.sh --- baselines/flwr_baselines/dev/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/baselines/flwr_baselines/dev/bootstrap.sh b/baselines/flwr_baselines/dev/bootstrap.sh index 5cb1792a282..a2f3080a82f 100755 --- a/baselines/flwr_baselines/dev/bootstrap.sh +++ b/baselines/flwr_baselines/dev/bootstrap.sh @@ -6,8 +6,8 @@ cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"/../ ./dev/rm-caches.sh # Upgrade/install spcific versions of `pip`, `setuptools`, and `poetry` -python -m pip install -U pip==24.0.0 -python -m pip install -U setuptools==69.5.1 +python -m pip install -U pip==23.3.1 +python -m pip install -U setuptools==68.2.2 python -m pip install -U poetry==1.7.1 # Use `poetry` to install project dependencies