From 65b6a7b6cb7a453f2a9dd9a2818567b557ee4e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Garc=C3=ADa=20Amor?= <ogarcia@connectical.com>
Date: Tue, 22 Nov 2016 16:29:41 +0100
Subject: [PATCH] Install requirements with pip instead with setup

---
 README.md                                | 1 +
 requirements.txt                         | 3 ++-
 setup.py                                 | 5 -----
 sysdweb/templates/static/css/sysdweb.css | 4 ----
 sysdweb/templates/views/journal.tpl      | 4 ++--
 5 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 7657bea..d0d88f8 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ git clone https://github.com/ogarcia/sysdweb.git
 virtualenv3 ./sysdweb-venv
 source ./sysdweb-venv/bin/activate
 cd sysdweb
+pip install -r requirements.txt
 python setup.py install
 ```
 
diff --git a/requirements.txt b/requirements.txt
index 79cac3f..13e31f0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 bottle >= 0.12.10
-dbus-python >= 1.2.4
+dbus-python
+systemd-python
diff --git a/setup.py b/setup.py
index 56d8e96..7fd41b3 100644
--- a/setup.py
+++ b/setup.py
@@ -40,11 +40,6 @@ def read(fname):
             'sysdweb = sysdweb.main:main'
         ]
     },
-    install_requires = [
-        "bottle>=0.12.10",
-        "dbus-python>=1.2.4",
-        "systemd-python"
-    ],
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Topic :: Utilities",
diff --git a/sysdweb/templates/static/css/sysdweb.css b/sysdweb/templates/static/css/sysdweb.css
index 347c3d9..416e50a 100644
--- a/sysdweb/templates/static/css/sysdweb.css
+++ b/sysdweb/templates/static/css/sysdweb.css
@@ -18,10 +18,6 @@ a:hover {
   margin-bottom: 0
 }
 
-pre {
-  margin-bottom: 0
-}
-
 .table > tbody > tr > td {
   vertical-align: middle;
 }
diff --git a/sysdweb/templates/views/journal.tpl b/sysdweb/templates/views/journal.tpl
index 4a16682..c260adb 100644
--- a/sysdweb/templates/views/journal.tpl
+++ b/sysdweb/templates/views/journal.tpl
@@ -30,11 +30,11 @@
         <small>{{hostname or 'sysdweb'}}</small></h1>
       </div>
       <div>
-        <pre id="journal">
+<pre id="journal">
 % for line in journal:
 {{line}}
 % end
-        </pre>
+</pre>
       </div>
     </div>
   </body>