From 05564a8afa47bb35234b4e114be5f4bcebcd20b0 Mon Sep 17 00:00:00 2001
From: Chris Fiege <chris@tinyhost.de>
Date: Wed, 5 Feb 2020 20:10:52 +0100
Subject: [PATCH] Adapt to flamingo v0.12
Signed-off-by: Chris Fiege <chris@tinyhost.de>
---
flamingo/Makefile | 9 +++++----
flamingo/settings.py | 5 +++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/flamingo/Makefile b/flamingo/Makefile
index 7a789d8..a1af8fc 100644
--- a/flamingo/Makefile
+++ b/flamingo/Makefile
@@ -3,10 +3,10 @@ PYTHON_VENV=env
PROJECT_ROOT=.
WEBSERVER_PORT=8080
-WEBSERVER_HOST=localhost
+WEBSERVER_HOST=0.0.0.0
FLAMINGO_OUTPUT=output
-FLAMINGO_ARGS=-p $(PROJECT_ROOT)
+FLAMINGO_ARGS=-s settings.py
FLAMINGO_SERVER_ARGS=$(FLAMINGO_ARGS) --port=$(WEBSERVER_PORT) --host=$(WEBSERVER_HOST)
@@ -17,7 +17,7 @@ $(PYTHON_VENV)/.created.deploy:
rm -rf $(PYTHON_VENV) && \
$(PYTHON) -m venv $(PYTHON_VENV) && \
. $(PYTHON_VENV)/bin/activate && \
- pip install -r ./REQUIREMENTS-deploy.txt > $(PYTHON_VENV)/build.log 2>&1 && \
+ pip install --upgrade -r ./REQUIREMENTS-deploy.txt > $(PYTHON_VENV)/build.log 2>&1 && \
(date > $(PYTHON_VENV)/.created.deploy) || \
(echo "\e[31m"; cat $(PYTHON_VENV)/build.log; echo "\e[0m"; exit 1)
@@ -25,7 +25,7 @@ deployenv: $(PYTHON_VENV)/.created.deploy
$(PYTHON_VENV)/.created.full:
. $(PYTHON_VENV)/bin/activate && \
- pip install -r ./REQUIREMENTS-full.txt > $(PYTHON_VENV)/build.log 2>&1 && \
+ pip install --upgrade -r ./REQUIREMENTS-full.txt > $(PYTHON_VENV)/build.log 2>&1 && \
(date > $(PYTHON_VENV)/.created.full) || \
(echo "\e[31m"; cat $(PYTHON_VENV)/build.log; echo "\e[0m"; exit 1)
@@ -39,6 +39,7 @@ distclean:
# build #######################################################################
+
html: deployenv
. $(PYTHON_VENV)/bin/activate && \
flamingo build $(FLAMINGO_ARGS)
diff --git a/flamingo/settings.py b/flamingo/settings.py
index 8dbc53f..8874164 100644
--- a/flamingo/settings.py
+++ b/flamingo/settings.py
@@ -17,3 +17,8 @@ DEFAULT_PLUGINS = [x for x in DEFAULT_PLUGINS if x != "flamingo.plugins.HTML"]
POST_BUILD_LAYERS = [
'static',
]
+
+THEME_PATHS = [
+ 'theme/',
+]
+
--
GitLab