Fixes for installation through pip.

setup.py

@@ -5,10 +5,6 @@
 from distutils.core import setup
 from setuptools import find_packages
 
-def get_requirements():
-    with open('requirements.txt', 'r') as f:
-        return f.read().splitlines()
-
 def get_long_description():
     path = os.path.join(os.path.dirname(__file__), 'README.md')
     with open(path) as f:
@@ -21,7 +17,7 @@ def get_data_files(path, strip='', prefix=''):
     data_files = []
     for dirpath, dirnames, filenames in os.walk(path):
         files = [os.path.join(dirpath, filename) for filename in filenames]
-        data_files.append( (prefix + dirpath[len(strip):], files) )
+        data_files.append( [prefix + dirpath[len(strip):], files] )
     return data_files
 
 
@@ -32,7 +28,6 @@ def get_data_files(path, strip='', prefix=''):
     print(' git push --tags')
     sys.exit()
 
-
 setup(
     name='ansible-cmdb',
     version=get_version(),
@@ -47,11 +42,15 @@ def get_data_files(path, strip='', prefix=''):
     package_dir={'': 'src'},
     packages=find_packages('src'),
     include_package_data=True,
-    data_files=get_data_files('src/ansiblecmdb/data',
-                              strip='src',
-                              prefix='lib/'),
+    data_files=\
+        get_data_files(
+            'src/ansiblecmdb/data',
+            strip='src',
+            prefix='lib'
+        ) +
+        [['lib/ansiblecmdb/', ['src/ansible-cmdb.py']]],
     zip_safe=False,
-    install_requires=get_requirements(),
+    install_requires=['mako', 'pyyaml', 'ushlex', 'jsonxs'],
     scripts=[
         'src/ansible-cmdb',
     ],

src/ansible-cmdb

@@ -25,8 +25,10 @@ if [ -f "$BIN_DIR/ansible-cmdb.py" ]; then
     ANSIBLE_CMDB="$BIN_DIR/ansible-cmdb.py"
 elif [ -f "$BIN_DIR/../lib/ansible-cmdb/ansible-cmdb.py" ]; then
     ANSIBLE_CMDB="$BIN_DIR/../lib/ansible-cmdb/ansible-cmdb.py"
+elif [ -f "$BIN_DIR/../lib/ansiblecmdb/ansible-cmdb.py" ]; then
+    ANSIBLE_CMDB="$BIN_DIR/../lib/ansiblecmdb/ansible-cmdb.py"
 else
-    echo "Couldn't find $BIN_DIR/ansible-cmdb.py in . or $BIN_DIR/../lib/ansible-cmdb (cwd=$PWD)" >&2
+    echo "Couldn't find $BIN_DIR/ansible-cmdb.py in . or $BIN_DIR/../lib/ansible-cmdb/ or $BIN_DIR/../lib/ansiblecmdb/ (cwd=$PWD)" >&2
     exit 2
 fi