Skip to content
Snippets Groups Projects
Commit 05564a8a authored by chrissi^'s avatar chrissi^
Browse files

Adapt to flamingo v0.12


Signed-off-by: default avatarChris Fiege <chris@tinyhost.de>
parent e84a204d
No related branches found
No related tags found
No related merge requests found
...@@ -3,10 +3,10 @@ PYTHON_VENV=env ...@@ -3,10 +3,10 @@ PYTHON_VENV=env
PROJECT_ROOT=. PROJECT_ROOT=.
WEBSERVER_PORT=8080 WEBSERVER_PORT=8080
WEBSERVER_HOST=localhost WEBSERVER_HOST=0.0.0.0
FLAMINGO_OUTPUT=output FLAMINGO_OUTPUT=output
FLAMINGO_ARGS=-p $(PROJECT_ROOT) FLAMINGO_ARGS=-s settings.py
FLAMINGO_SERVER_ARGS=$(FLAMINGO_ARGS) --port=$(WEBSERVER_PORT) --host=$(WEBSERVER_HOST) FLAMINGO_SERVER_ARGS=$(FLAMINGO_ARGS) --port=$(WEBSERVER_PORT) --host=$(WEBSERVER_HOST)
...@@ -17,7 +17,7 @@ $(PYTHON_VENV)/.created.deploy: ...@@ -17,7 +17,7 @@ $(PYTHON_VENV)/.created.deploy:
rm -rf $(PYTHON_VENV) && \ rm -rf $(PYTHON_VENV) && \
$(PYTHON) -m venv $(PYTHON_VENV) && \ $(PYTHON) -m venv $(PYTHON_VENV) && \
. $(PYTHON_VENV)/bin/activate && \ . $(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) || \ (date > $(PYTHON_VENV)/.created.deploy) || \
(echo "\e[31m"; cat $(PYTHON_VENV)/build.log; echo "\e[0m"; exit 1) (echo "\e[31m"; cat $(PYTHON_VENV)/build.log; echo "\e[0m"; exit 1)
...@@ -25,7 +25,7 @@ deployenv: $(PYTHON_VENV)/.created.deploy ...@@ -25,7 +25,7 @@ deployenv: $(PYTHON_VENV)/.created.deploy
$(PYTHON_VENV)/.created.full: $(PYTHON_VENV)/.created.full:
. $(PYTHON_VENV)/bin/activate && \ . $(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) || \ (date > $(PYTHON_VENV)/.created.full) || \
(echo "\e[31m"; cat $(PYTHON_VENV)/build.log; echo "\e[0m"; exit 1) (echo "\e[31m"; cat $(PYTHON_VENV)/build.log; echo "\e[0m"; exit 1)
...@@ -39,6 +39,7 @@ distclean: ...@@ -39,6 +39,7 @@ distclean:
# build ####################################################################### # build #######################################################################
html: deployenv html: deployenv
. $(PYTHON_VENV)/bin/activate && \ . $(PYTHON_VENV)/bin/activate && \
flamingo build $(FLAMINGO_ARGS) flamingo build $(FLAMINGO_ARGS)
......
...@@ -17,3 +17,8 @@ DEFAULT_PLUGINS = [x for x in DEFAULT_PLUGINS if x != "flamingo.plugins.HTML"] ...@@ -17,3 +17,8 @@ DEFAULT_PLUGINS = [x for x in DEFAULT_PLUGINS if x != "flamingo.plugins.HTML"]
POST_BUILD_LAYERS = [ POST_BUILD_LAYERS = [
'static', 'static',
] ]
THEME_PATHS = [
'theme/',
]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment