From e7625c38a3f62479eef4c8879297001cc3f170e5 Mon Sep 17 00:00:00 2001 From: d3vyce Date: Sat, 24 Feb 2024 13:22:23 +0100 Subject: [PATCH] update --- .gitea/workflows/build_hugo_image.yml | 9 +- Dockerfile | 3 +- README.md | 2 + .../posts/migrate-from-ghost-to-hugo/index.md | 15 +++ .../index.md | 122 ++++++++++++++++++ hugo.Dockerfile | 2 +- themes/blowfish | 2 +- 7 files changed, 145 insertions(+), 10 deletions(-) create mode 100644 content/posts/uv-the-new-python-package-installer-written-in-rust/index.md diff --git a/.gitea/workflows/build_hugo_image.yml b/.gitea/workflows/build_hugo_image.yml index 86b0147..fb50a60 100644 --- a/.gitea/workflows/build_hugo_image.yml +++ b/.gitea/workflows/build_hugo_image.yml @@ -2,8 +2,8 @@ name: Build Hugo Docker Image on: push: - branches: - - hugo_update + paths: + - "hugo.Dockerfile" jobs: build docker: @@ -11,11 +11,6 @@ jobs: steps: - name: checkout code uses: actions/checkout@v3 - # - name: Get changed files - # id: changed-files - # uses: tj-actions/changed-files@v42 - # with: - # files: hugo.Dockerfile - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx diff --git a/Dockerfile b/Dockerfile index 91c12ed..e02899e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,8 @@ FROM git.d3vyce.fr/d3vyce/hugo:latest AS build WORKDIR /opt/blog COPY . /opt/blog/ -RUN git submodule update --init --recursive +RUN git submodule update --init --recursive && \ + git -C themes/blowfish/ checkout v2.58.0 RUN hugo # Publish Stage diff --git a/README.md b/README.md index e845695..5b03705 100644 --- a/README.md +++ b/README.md @@ -7,5 +7,7 @@ CGO_ENABLED=1 go install -tags extended github.com/gohugoio/hugo@latest git submodule update --recursive git lfs pull +git -C themes/blowfish/ checkout [TAG] +git submodule update --remote --merge hugo server --buildDrafts ``` \ No newline at end of file diff --git a/content/posts/migrate-from-ghost-to-hugo/index.md b/content/posts/migrate-from-ghost-to-hugo/index.md index 619ce93..663ecd4 100644 --- a/content/posts/migrate-from-ghost-to-hugo/index.md +++ b/content/posts/migrate-from-ghost-to-hugo/index.md @@ -145,7 +145,22 @@ jobs: https://gitea.com/gitea/act_runner/issues/164 ## Conclusion: before/after comparison +Après avoir terminé la migration, j'ai comparé les 2 solutions. +### Performance +Lighthouse result for Ghost based blog: ![Ghost based blog lighthouse result](img/image-1.webp) +Lighthouse result for Hugo based blog: ![Hugo based blog lighthouse result](img/image-2.webp) + +| Metric | Ghost (Dawn) | Hugo (Blowfish) | +|--------------------------|--------------|-----------------| +| First Contentful Paint | 0.5 s | 0.3 s | +| Largest Contentful Paint | 0.6 s | 0.4 s | +| Total Blocking Time | 0 ms | 0 ms | +| Cumulative Layout Shift | 0.001 | 0 | +| Speed Index | 0.6 s | 0.3 s | + +### Ressources + diff --git a/content/posts/uv-the-new-python-package-installer-written-in-rust/index.md b/content/posts/uv-the-new-python-package-installer-written-in-rust/index.md new file mode 100644 index 0000000..a83f0ea --- /dev/null +++ b/content/posts/uv-the-new-python-package-installer-written-in-rust/index.md @@ -0,0 +1,122 @@ +--- +title: "UV the new python package installer written in Rust" +date: 2024-02-23 +draft: true +slug: "uv-the-new-python-package-installer-written-in-rust" +tags: ["ci/cd", "docker", "python", "tools"] +type: "programming" +--- + +## Overview + + +## UV benchmark +Let's compare UV and VENV/PIP to see how this new solution performs: according to the creators, UV should be around 80x faster than `python -m venv` and 7x faster than `virtualenv`. + +After creating virtual environments with these different tools, I was able to obtain the following results: + +{{< chart >}} +type: 'bar', +data: { + labels: ['uv', 'virtualenv', 'venv'], + datasets: [{ + data: [0.010, 0.153, 1.539], + }] +}, +options: { + indexAxis: 'y', + elements: { + bar: { + borderWidth: 2, + } + }, + responsive: true, + plugins: { + legend: { + display: false, + }, + title: { + display: true, + text: 'Virtual environment creation' + } + } +} +{{< /chart >}} + +In my case, UV is ~15x faster than `virtualenv` and ~150x faster than `python -m venv`. I then tried installing python packets with UV and PIP to compare speeds: + +{{< chart >}} +type: 'bar', +data: { + labels: ['uv', 'uv+cache', 'pip'], + datasets: [{ + data: [2.961, 0.413, 13.917], + }] +}, +options: { + indexAxis: 'y', + elements: { + bar: { + borderWidth: 2, + } + }, + responsive: true, + plugins: { + legend: { + display: false, + }, + title: { + display: true, + text: 'Packages install (~100)' + } + } +} +{{< /chart >}} + +For packet insertion I find that UV is ~5x faster than pip and ~33x faster then `pip` with the UV cache. + +## Docker image for CI/CD +UV + +```dockerfile +FROM python:3.11-slim + +RUN python3 -m pip install --upgrade pip && \ + pip3 install uv && \ + uv venv && \ + . /.venv/bin/activate && \ + uv pip install ruff + +ENV VIRTUAL_ENV /.venv +ENV PATH /.venv/bin:$PATH +``` + +```bash +debian@debian:~/dev/images$ docker build -t uv_python . +[...] +debian@debian:~/dev/images$ docker run -it --rm uv_python bash +root@ec910e7ea8eb:/# uv pip install django +Resolved 3 packages in 483ms +Downloaded 3 packages in 584ms +Installed 3 packages in 150ms + + asgiref==3.7.2 + + django==5.0.2 + + sqlparse==0.4.4 +root@ec910e7ea8eb:/# python3 +Python 3.11.8 (main, Feb 7 2024, 22:49:54) [GCC 12.2.0] on linux +Type "help", "copyright", "credits" or "license" for more information. +>>> import django +>>> +``` + +```yml +[...] +variables: + UV_CACHE_DIR: "$CI_PROJECT_DIR/.cache/uv" + +cache: + - key: uv-pip-cache + paths: + - $CI_PROJECT_DIR/.cache/uv +[...] +``` diff --git a/hugo.Dockerfile b/hugo.Dockerfile index 262a294..7b9d788 100644 --- a/hugo.Dockerfile +++ b/hugo.Dockerfile @@ -7,4 +7,4 @@ ENV GO111MODULE=on RUN apk update && \ apk add --no-cache gcc musl-dev g++ git -RUN go install -tags extended github.com/gohugoio/hugo@v0.122.0 +RUN go install -tags extended github.com/gohugoio/hugo@v0.123.3 diff --git a/themes/blowfish b/themes/blowfish index e7ce386..f2b934c 160000 --- a/themes/blowfish +++ b/themes/blowfish @@ -1 +1 @@ -Subproject commit e7ce3860490e6b8f33578675b2898bc50d097513 +Subproject commit f2b934c8f471fa2bf31bcf4efe08be244d363e6f