Merge branch 'release/0.2.0'

blockchainprojects · Aug 26, 2019 · 541ae94 · 541ae94
2 parents 8fb91a7 + 02ec1dd
commit 541ae94
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/.changes/0.2.0.json b/.changes/0.2.0.json
@@ -0,0 +1,10 @@
+[
+  {
+    "description": "Allow to replace the template layout of the form",
+    "type": "minor"
+  },
+  {
+    "description": "Remove uuid from requirements.txt",
+    "type": "patch"
+  }
+]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## 0.2.0
+
+- minor: Allow to replace the template layout of the form
+- patch: Remove uuid from requirements.txt
+
 ## 0.1.0
 
 - minor: Cleanup and ensure we can use this with MySql/MariaDB

diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 .PHONY: clean-pyc clean-build docs
-CURRENT_VERSION := $(shell semversioner current-version)
 
 clean: clean-build clean-pyc
 
@@ -49,9 +48,14 @@ docs:
 
 prepare: clean test docs authors
 
-semver:
+semver: semver-release semver-updates
+
+semver-release:
 	semversioner release
+
+semver-updates:
 	semversioner changelog > CHANGELOG.md
+	$(eval CURRENT_VERSION = $(shell semversioner current-version))
 	sed -i "s/^__version__.*/__version__ = \"$(CURRENT_VERSION)\"/" setup.py
 	git add .changes setup.py CHANGELOG.md
 	git commit -m "semverioner release updates" --no-verify

diff --git a/flask_beet/__init__.py b/flask_beet/__init__.py
@@ -24,6 +24,7 @@
     "ONBOARDING_MESSAGE_KEY": "_onboarding_message",
     # TEMPLATES
     "LOGIN_TEMPLATE": "/beet/login.html",
+    "LAYOUT_TEMPLATE": "layout.html",
 }
 
 

diff --git a/flask_beet/templates/beet/login.html b/flask_beet/templates/beet/login.html
@@ -1,4 +1,5 @@
-{% extends "layout.html" %}
+{% set layout = config.get('BEET_LAYOUT_TEMPLATE') %}
+{% extends layout %}
 
 {% block content %}
 {% include "_messages.html" %}

diff --git a/flask_beet/views.py b/flask_beet/views.py
@@ -28,9 +28,7 @@ def login():
         if beet_login_form.message.signedMessage.plain_message != session.get(
             app.config.get("BEET_UNIQUE_MESSAGE_SESSION_KEY")
         ):
-            flash(
-                app.config.get("BEET_INVALID_PAYLOAD_MESSAGE", "ERRORORORORO"), "error"
-            )
+            flash(app.config.get("BEET_INVALID_PAYLOAD_MESSAGE"), "error")
             return redirect(url_for(".login"))
 
         account_name = beet_login_form.message.signedMessage.signed_by_name

diff --git a/requirements.txt b/requirements.txt
@@ -10,5 +10,4 @@ Flask-Session
 SQLAlchemy
 WTForms
 Werkzeug
-uuid
 blinker
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup
 
-__version__ = "0.0.5"
+__version__ = "0.2.0"
 
 setup(
     name="Flask-Beet",