From fa06f52c8ee7aea48b3820f2ab85e7e5b2a67887 Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Tue, 19 Nov 2024 22:58:00 +0000 Subject: [PATCH 1/4] Add msgspec package A fast serialization and validation library, with builtin support for JSON, MessagePack, YAML, and TOML. Required by Flask-Session --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 6a1a363..a544aee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ cffi gevent==24.11.1 +msgspec==0.18.6 mysqlclient==2.2.6 regex==2024.11.6 rcssmin==1.2.0 From 3b65194720a21bb4879cfe37dbc814d34b87a8d2 Mon Sep 17 00:00:00 2001 From: macbre Date: Wed, 20 Nov 2024 17:14:52 +0000 Subject: [PATCH 2/4] Use msgspec from trunk --- Dockerfile | 3 ++- README.md | 5 +++-- requirements.txt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2f2d651..6bedbc9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ RUN apk update &&\ apk add --no-cache --virtual .build-deps \ build-base \ gcc \ + git \ libffi-dev \ mariadb-dev &&\ pip install --upgrade pip && pip install -r /tmp/requirements.txt \ @@ -25,6 +26,6 @@ RUN apk update &&\ # tag an image ARG GITHUB_SHA -ENV GITHUB_SHA ${GITHUB_SHA} +ENV GITHUB_SHA=${GITHUB_SHA} RUN python -V; pip list; env diff --git a/README.md b/README.md index 0136a7e..f4ba369 100644 --- a/README.md +++ b/README.md @@ -23,12 +23,13 @@ Package Version cffi 1.17.1 gevent 24.11.1 greenlet 3.1.1 -mysqlclient 2.2.5 +msgspec 0.18.6+30.g595c33c +mysqlclient 2.2.6 pip 24.3.1 pycparser 2.22 rcssmin 1.1.3 regex 2024.11.6 -setuptools 75.4.0 +setuptools 75.5.0 zope.event 5.0 zope.interface 7.1.1 diff --git a/requirements.txt b/requirements.txt index a544aee..b27fe07 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cffi gevent==24.11.1 -msgspec==0.18.6 +msgspec @ git+https://github.com/jcrist/msgspec@595c33c4a71c6d0c539b82233982a65819e240cf mysqlclient==2.2.6 regex==2024.11.6 rcssmin==1.2.0 From ae3b5a046025d31dc9da3e6c55f2e9dd8de78b18 Mon Sep 17 00:00:00 2001 From: macbre Date: Wed, 20 Nov 2024 17:16:33 +0000 Subject: [PATCH 3/4] CI: show pip list in a separate step --- .github/workflows/dockerimage.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 8acdf52..78ef0f2 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -12,6 +12,7 @@ jobs: steps: - uses: actions/checkout@v4.2.2 + - name: Build the Docker image env: # @see https://testdriven.io/blog/faster-ci-builds-with-docker-cache/ @@ -21,4 +22,8 @@ jobs: docker build . \ --cache-from $CACHE_IMAGE \ --tag ${{ github.repository }} + + - name: Show details + run: | docker images + docker run --rm ${{ github.repository }} pip list From 397feeeaeab71de86635b89c1df46c6a33ad4dbf Mon Sep 17 00:00:00 2001 From: Maciej Brencz Date: Wed, 20 Nov 2024 17:18:28 +0000 Subject: [PATCH 4/4] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f4ba369..e7d066e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Python 3.13.0 $ pip list Package Version --------------- --------- +-------------- ------------------ cffi 1.17.1 gevent 24.11.1 greenlet 3.1.1 @@ -27,7 +27,7 @@ msgspec 0.18.6+30.g595c33c mysqlclient 2.2.6 pip 24.3.1 pycparser 2.22 -rcssmin 1.1.3 +rcssmin 1.2.0 regex 2024.11.6 setuptools 75.5.0 zope.event 5.0 @@ -35,5 +35,5 @@ zope.interface 7.1.1 $ docker images | head -n2 REPOSITORY TAG IMAGE ID CREATED SIZE -pigs-will-fly/docker-python latest c94c5a7075da 1 second ago 137MB +pigs-will-fly/docker-python latest db014e358895 1 second ago 140MB ```