Install requirements with pip instead with setup

ogarcia · Nov 22, 2016 · 65b6a7b · 65b6a7b
1 parent 7dc0fcf
commit 65b6a7b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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>