Merge branch 'main' into main

Merge pull request 'Fix Drone build' (#176 ) from fix-drone-build into main
Reviewed-on: ag_kommunikation/webseite#176
2023-05-02 23:15:26 +02:00 · 2023-05-02 23:01:11 +02:00 · 2023-05-02 22:52:53 +02:00 · 2023-05-02 22:37:07 +02:00 · 2023-05-02 18:35:35 +02:00 · 2023-05-02 18:25:01 +02:00
2 changed files with 12 additions and 11 deletions
--- 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
+      - 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
+      - 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
+      - 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: 0d28bd52da692fb47e34b3fcb103df15005109a7cdaee3ea4a8a76a605660017
+hmac: 1634ef6329d6399a622c569b06bf084859854e34958585f2a83bd2f0b1bb47ca

 ...
--- a/requirements.txt
+++ b/requirements.txt
@ -1 +1,2 @@
-lektor
+lektor==3.3.8
+Werkzeug<2.3
Author	SHA1	Message	Date
zeitschlag	c12e7a11d3	Merge branch 'main' into main	2023-05-02 23:15:26 +02:00
Brain	55f46b841e	Merge pull request 'Fix Drone build' (#176 ) from fix-drone-build into main Reviewed-on: ag_kommunikation/webseite#176	2023-05-02 23:01:11 +02:00
Brain	db40700b08	Pin Werkzeug to pre-deprecation version	2023-05-02 22:52:53 +02:00
Brain	2cfa61aeaa	Use pip and venv for installation	2023-05-02 22:37:07 +02:00
Brain	d2cc570bf3	Pin version in command, because of pipx	2023-05-02 18:35:35 +02:00
Brain	f397bd3ae3	Use requirements.txt with Drone	2023-05-02 18:25:01 +02:00
Brain	6e2ae70b1b	Pin lektor to version 3.3.8	2023-05-02 18:15:12 +02:00