Add more blocks and use pipenv

iksaif · Apr 19, 2019 · 446f89f · 446f89f
1 parent b9cf65b
commit 446f89f
Show file tree

Hide file tree

Showing 5 changed files with 142 additions and 4 deletions.
diff --git a/Pipfile b/Pipfile
@@ -0,0 +1,12 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+flacon = {path = ".",editable = true}
+
+[requires]
+python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/flacon/templates/flacon/_base.html b/flacon/templates/flacon/_base.html
@@ -8,12 +8,17 @@
     <title>{% block title %}{{ flacon.name }}{% endblock %}</title>
 
     <!-- Bootstrap -->
+    {% block bootstrap_head %}
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link href="https://stackpath.bootstrapcdn.com/bootswatch/4.3.1/lumen/bootstrap.min.css" rel="stylesheet" integrity="sha384-iqcNtN3rj6Y1HX/R0a3zu3ngmbdwEa9qQGHdkXwSRoiE+Gj71p0UNDSm99LcXiXV" crossorigin="anonymous">
+    {% endblock %}
 
     <!-- Font awesome -->
+    {% block fontawesome_head %}
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
+    {% endblock %}
 
+    {% block extra_head %}{% endblock %}
 </head>
 <body>
 <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
@@ -44,8 +49,13 @@
     {% block content %}
     {% endblock %}
 </div>
+
+{% block boostrap_scripts %}
 <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+{% endblock %}
+{% block extra_scripts %}{% endblock %}
+
 </body>
 </html>
diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def _read_reqs(relpath):
 _TEST_REQUIRE = [l for l in _TESTS_REQUIREMENTS_TXT if "://" not in l]
 
 readme_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), "README.md")
-with open(readme_file, encoding="utf-8") as f:
+with open(readme_file) as f:
     readme = f.read()
 
 
@@ -50,8 +50,6 @@ def _read_reqs(relpath):
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: Apache Software License",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
     ],

diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {py27,py35,py36,py37}-coverage,pylama
+envlist = {py36,py37}-coverage
 
 [testenv]
 commands =