From 56ccede0d70292e7797bc9d55903225418054c37 Mon Sep 17 00:00:00 2001 From: Leandro Damascena Date: Sun, 16 Jun 2024 00:42:45 +0100 Subject: [PATCH] Fixing problems with gitpod env --- .gitpod.Dockerfile | 8 ++++---- .gitpod_requirements.in | 2 +- .gitpod_requirements.txt | 8 ++++---- Makefile | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index efa414f9ac7..9fa927ddac6 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -1,11 +1,11 @@ -# See here all gitpod images available: https://hub.docker.com/r/gitpod/workspace-python-3.9/tags -# Current python version: 3.9.13 -FROM gitpod/workspace-python-3.9@sha256:de87d4ebffe8daab2e8fef96ec20497ae4f39e8dcb9dec1483d0be61ea78e8cd +# See here all gitpod images available: https://hub.docker.com/r/gitpod/workspace-python-3.11/tags +# Current python version: 3.11.9 +FROM gitpod/workspace-python-3.11@sha256:2d9a242844bef5710ab4622899a5254a0c59f0ac58c0d3ac998f749323f43951 WORKDIR /app ADD . /app # Installing pre-commit as system package and not user package. Git needs this to execute pre-commit hooks. RUN export PIP_USER=no -# v3.3.3 +# pre-commit v3.7.1 RUN python3 -m pip install --require-hashes -r .gitpod_requirements.txt \ No newline at end of file diff --git a/.gitpod_requirements.in b/.gitpod_requirements.in index e88cdf05e74..b427b003fa9 100644 --- a/.gitpod_requirements.in +++ b/.gitpod_requirements.in @@ -1 +1 @@ -pre-commit==3.3.3 \ No newline at end of file +pre-commit==3.7.1 \ No newline at end of file diff --git a/.gitpod_requirements.txt b/.gitpod_requirements.txt index db6274738d3..a9643d7dfdf 100644 --- a/.gitpod_requirements.txt +++ b/.gitpod_requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.9 +# This file is autogenerated by pip-compile with Python 3.11 # by the following command: # # pip-compile --generate-hashes --output-file=.gitpod_requirements.txt .gitpod_requirements.in @@ -28,9 +28,9 @@ platformdirs==3.8.0 \ --hash=sha256:b0cabcb11063d21a0b261d557acb0a9d2126350e63b70cdf7db6347baea456dc \ --hash=sha256:ca9ed98ce73076ba72e092b23d3c93ea6c4e186b3f1c3dad6edd98ff6ffcca2e # via virtualenv -pre-commit==3.3.3 \ - --hash=sha256:10badb65d6a38caff29703362271d7dca483d01da88f9d7e05d0b97171c136cb \ - --hash=sha256:a2256f489cd913d575c145132ae196fe335da32d91a8294b7afe6622335dd023 +pre-commit==3.7.1 \ + --hash=sha256:8ca3ad567bc78a4972a3f1a477e94a79d4597e8140a6e0b651c5e33899c3654a \ + --hash=sha256:fae36fd1d7ad7d6a5a1c0b0d5adb2ed1a3bda5a21bf6c3e5372073d7a11cd4c5 # via -r .gitpod_requirements.in pyyaml==6.0 \ --hash=sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf \ diff --git a/Makefile b/Makefile index a91464e5f56..55bed054c32 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,6 @@ dev: dev-gitpod: pip install --upgrade pip poetry - @$(MAKE) dev-version-plugin poetry install --extras "all redis datamasking" pre-commit install