From 00b6d2af0400c70b8c7f8036f689bb830413d541 Mon Sep 17 00:00:00 2001 From: Philipp Belitz Date: Fri, 2 Dec 2022 10:46:34 +0100 Subject: [PATCH] fix: revert frozenlist changes There was a problem with the frozenlist package, which didn't had its packages added to wheels (https://github.com/aio-libs/frozenlist/issues/342). The packages are now added, so the fix for this can be reverted, except for the pytest job which is the only one building on a debian image (faster runtime). Here the yarl and multidict packages still have the same problem as frozenlist had. Waiting fo a fix here. --- .github/actions/safety/action.yaml | 1 - .github/workflows/cicd.yaml | 1 - docker/Dockerfile | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/actions/safety/action.yaml b/.github/actions/safety/action.yaml index 6f94d36b4..ca300cebe 100644 --- a/.github/actions/safety/action.yaml +++ b/.github/actions/safety/action.yaml @@ -5,7 +5,6 @@ runs: steps: - name: Install packages run: | - apt update && apt install gcc build-essential -y pip3 install --upgrade pip pip3 install -r requirements_dev.txt shell: sh diff --git a/.github/workflows/cicd.yaml b/.github/workflows/cicd.yaml index b1b1e8513..9a18f3656 100644 --- a/.github/workflows/cicd.yaml +++ b/.github/workflows/cicd.yaml @@ -73,7 +73,6 @@ jobs: - name: Install packages # Since we run inside an alpine based container, we cannot compile yarl and multidic run: | - apk add gcc libc-dev pip3 install --upgrade pip YARL_NO_EXTENSIONS=1 MULTIDICT_NO_EXTENSIONS=1 pip3 install -r requirements_dev.txt - name: Lint diff --git a/docker/Dockerfile b/docker/Dockerfile index 4901a497d..fe2e5efb2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,7 @@ COPY requirements.txt /requirements.txt # Have to upgrade pip and install extra packages due to error when installing frozenlist # Since we run inside an alpine based container, we cannot compile yarl and multidict -RUN apk add --no-cache gcc~=11.2.1_git20220219-r2 libc-dev~=0.7.2-r3 \ +RUN apk add --no-cache \ && pip install --no-cache-dir --upgrade pip~=22.3 \ && YARL_NO_EXTENSIONS=1 MULTIDICT_NO_EXTENSIONS=1 pip install --no-cache-dir --prefix=/install -r /requirements.txt