fix pretty df

sirfoga · Oct 5, 2018 · 7110a4d · 7110a4d
1 parent ee9792b
commit 7110a4d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 27 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-10.0.6 (b4f002a80c2cda0f2781a29ccf053b96829e97a3 at 14:55:46 18-10-04 +0200)
+10.0.6 (2eb521f377da01055c34b95820d056650bb85063 at 18:32:55 18-10-04 +0200)
diff --git a/fast_install.sh b/fast_install.sh
@@ -1,9 +1,10 @@
 # !/bin/bash
 # coding: utf_8
 
-LOCAL_FOLDER="${PWD}/hal/*"
+PACKAGE="hal"
+LOCAL_FOLDER="${PWD}/${PACKAGE}/*"
 PYTHON_VERSION="python3.6"
-DIST_FOLDER="/usr/local/lib/${PYTHON_VERSION}/dist-packages/hal"
+DIST_FOLDER="/usr/local/lib/${PYTHON_VERSION}/dist-packages/${PACKAGE}"
 
 rm -rf ${DIST_FOLDER}  # clean
 mkdir ${DIST_FOLDER}

diff --git a/hal/streams/pretty_table.py b/hal/streams/pretty_table.py
@@ -137,8 +137,8 @@ def from_df(df):
             Parses data and builds an instance of this class
         """
 
-        labels = df.columns.tolist()
-        data = df.reset_index().values.tolist()
+        labels = df.keys().tolist()
+        data = df.values.tolist()
         return SqlTable(labels, data, "\n")
 
 

diff --git a/setup.py b/setup.py
@@ -29,27 +29,5 @@
     keywords="library scratch awesome",
     url="https://github.com/sirfoga/pyhal",
     packages=find_packages(exclude=["tests"]),
-    install_requires=[
-        "aiohttp",
-        "aiosocks",
-        "bs4",
-        "colorama",
-        "GitPython",
-        "httplib2",
-        "lxml",
-        "matplotlib",
-        "mutagen",
-        "numpy",
-        "oauth2client",
-        "psutil",
-        "pymongo",
-        "requests",
-        "scipy",
-        "send2trash",
-        "sklearn",
-        "statsmodels",
-        "stem",
-        "unidiff", 'pyparsing'
-    ],
     test_suite="tests"
 )