From 6e2ae70b1b808a29de898baa9af3264e340b3714 Mon Sep 17 00:00:00 2001 From: Brain Date: Tue, 2 May 2023 18:15:12 +0200 Subject: [PATCH 1/5] Pin lektor to version 3.3.8 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 58717e8..b3be5ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -lektor +lektor==3.3.8 From f397bd3ae3d52b7eb67ab038976c3f82f74fd162 Mon Sep 17 00:00:00 2001 From: Brain Date: Tue, 2 May 2023 18:25:01 +0200 Subject: [PATCH 2/5] Use requirements.txt with Drone --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 5244aa1..6b83665 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: - apk add imagemagick - python3 -m pip install --user pipx - export PATH=/root/.local/bin:$PATH - - pipx install lektor + - pipx install -r requirements.txt - lektor build --- @@ -40,7 +40,7 @@ steps: - apk add imagemagick - python3 -m pip install --user pipx - export PATH=/root/.local/bin:$PATH - - pipx install lektor + - pipx install -r requirements.txt - lektor build - apk add rsync openssh - mkdir ~/.ssh @@ -58,7 +58,7 @@ steps: - apk add imagemagick - python3 -m pip install --user pipx - export PATH=/root/.local/bin:$PATH - - pipx install lektor + - pipx install -r requirements.txt - lektor build - apk add rsync openssh - mkdir ~/.ssh @@ -70,6 +70,6 @@ steps: --- kind: signature -hmac: 0d28bd52da692fb47e34b3fcb103df15005109a7cdaee3ea4a8a76a605660017 +hmac: 66999f5600b38fb6336d3e05ea854c9f079d5ba2ccbc09182cbcef84b464051b ... From d2cc570bf3ea486c1133433c42fdb1756d19a1dd Mon Sep 17 00:00:00 2001 From: Brain Date: Tue, 2 May 2023 18:35:35 +0200 Subject: [PATCH 3/5] Pin version in command, because of pipx --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6b83665..e287097 100644 --- a/.drone.yml +++ b/.drone.yml @@ -18,7 +18,7 @@ steps: - apk add imagemagick - python3 -m pip install --user pipx - export PATH=/root/.local/bin:$PATH - - pipx install -r requirements.txt + - pipx install lektor==3.3.8 - lektor build --- @@ -40,7 +40,7 @@ steps: - apk add imagemagick - python3 -m pip install --user pipx - export PATH=/root/.local/bin:$PATH - - pipx install -r requirements.txt + - pipx install lektor==3.3.8 - lektor build - apk add rsync openssh - mkdir ~/.ssh @@ -58,7 +58,7 @@ steps: - apk add imagemagick - python3 -m pip install --user pipx - export PATH=/root/.local/bin:$PATH - - pipx install -r requirements.txt + - pipx install lektor==3.3.8 - lektor build - apk add rsync openssh - mkdir ~/.ssh @@ -70,6 +70,6 @@ steps: --- kind: signature -hmac: 66999f5600b38fb6336d3e05ea854c9f079d5ba2ccbc09182cbcef84b464051b +hmac: a04843afc36b75a13b62544539985bbf077d27f55d482737a3a20b33163d4eb9 ... From 2cfa61aeaa480b1f5b0ada58456a9437fe15a0f6 Mon Sep 17 00:00:00 2001 From: Brain Date: Tue, 2 May 2023 22:37:07 +0200 Subject: [PATCH 4/5] Use pip and venv for installation --- .drone.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index e287097..99e9766 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,9 +16,9 @@ steps: image: python:3.10-alpine commands: - apk add imagemagick - - python3 -m pip install --user pipx - - export PATH=/root/.local/bin:$PATH - - pipx install lektor==3.3.8 + - python3 -m venv venv + - . venv/bin/activate + - pip install -r requirements.txt - lektor build --- @@ -38,9 +38,9 @@ steps: from_secret: drone_ssh_key commands: - apk add imagemagick - - python3 -m pip install --user pipx - - export PATH=/root/.local/bin:$PATH - - pipx install lektor==3.3.8 + - python3 -m venv venv + - . venv/bin/activate + - pip install -r requirements.txt - lektor build - apk add rsync openssh - mkdir ~/.ssh @@ -56,9 +56,9 @@ steps: from_secret: drone_ssh_key commands: - apk add imagemagick - - python3 -m pip install --user pipx - - export PATH=/root/.local/bin:$PATH - - pipx install lektor==3.3.8 + - python3 -m venv venv + - . venv/bin/activate + - pip install -r requirements.txt - lektor build - apk add rsync openssh - mkdir ~/.ssh @@ -70,6 +70,6 @@ steps: --- kind: signature -hmac: a04843afc36b75a13b62544539985bbf077d27f55d482737a3a20b33163d4eb9 +hmac: 1634ef6329d6399a622c569b06bf084859854e34958585f2a83bd2f0b1bb47ca ... From db40700b0894584c2e64a45ef10333e8810091c8 Mon Sep 17 00:00:00 2001 From: Brain Date: Tue, 2 May 2023 22:52:53 +0200 Subject: [PATCH 5/5] Pin Werkzeug to pre-deprecation version --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b3be5ec..41ad001 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ lektor==3.3.8 +Werkzeug<2.3