From a5a525a3ff744ea151b3b806ebd896b1b4243890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Fei?= Date: Tue, 6 Sep 2022 08:17:48 +0200 Subject: [PATCH] fix: pin a barman compatible google-api-core release (#31) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will be reverted once barman removes the 'protobuf<3.18' requirement Signed-off-by: Niccolò Fei --- .github/workflows/update.yml | 4 ++-- Debian/update.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 259340fb..a8e97698 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -23,7 +23,7 @@ jobs: max_attempts: 3 command: | # pip-tools provides pip-compile used by update.sh - pip3 install --upgrade pip-tools + pip3 install --upgrade pip-tools pip export PATH=$HOME/.local/bin:$PATH echo "Updating Debian images" ./Debian/update.sh @@ -51,4 +51,4 @@ jobs: with: access_token: ${{ secrets.REPO_GHA_PAT }} branch: main - enforce_admins: ${{ steps.disable_include_admins.outputs.initial_status }} \ No newline at end of file + enforce_admins: ${{ steps.disable_include_admins.outputs.initial_status }} diff --git a/Debian/update.sh b/Debian/update.sh index 655e981e..6398dd7e 100755 --- a/Debian/update.sh +++ b/Debian/update.sh @@ -150,6 +150,9 @@ update_requirements() { # If there's a new version we need to recreate the requirements files echo "barman[cloud,azure,snappy,google] == $barmanVersion" > requirements.in + # TODO: Remove once barman removes the `protobuf<3.18` requirement + echo "google-api-core <= 2.8.2" >> requirements.in + # This will take the requirements.in file and generate a file # requirements.txt with the hashes for the required packages pip-compile --generate-hashes 2> /dev/null