From 3e0c57f1c7a2d972c91a3b6b58b98eabf41a71e0 Mon Sep 17 00:00:00 2001
From: Jan Laukemann <ol68umur@stud.informatik.uni-erlangen.de>
Date: Fri, 4 Oct 2019 00:40:23 +0200
Subject: [PATCH] fixes #36 database copy bug

---
 MANIFEST.in    | 2 +-
 osaca/osaca.py | 7 +++++--
 setup.py       | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index bb68385..f4d516a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,7 @@
 include README.rst
 include LICENSE
 include tox.ini
-recursive-include osaca/data/ *.csv
+recursive-include osaca/data/ *.yml
 include examples/*
 recursive-include tests *.py *.out
 recursive-include tests/testfiles/ *
diff --git a/osaca/osaca.py b/osaca/osaca.py
index f8ab5d6..d9c433a 100755
--- a/osaca/osaca.py
+++ b/osaca/osaca.py
@@ -17,7 +17,8 @@ from osaca.semantics import (KernelDG, MachineModel, SemanticsAppender,
 MODULE_DATA_DIR = os.path.join(
     os.path.dirname(os.path.split(os.path.abspath(__file__))[0]), 'osaca/data/'
 )
-DATA_DIR = os.path.expanduser('~') + '/.osaca/data/'
+LOCAL_OSACA_DIR = os.path.join(os.path.expanduser('~') + '/.osaca/')
+DATA_DIR = os.path.join(LOCAL_OSACA_DIR, 'data/')
 
 
 # Stolen from pip
@@ -122,7 +123,9 @@ def check_user_dir():
     # Check if data files are already in usr dir, otherwise create them
     if not os.path.isdir(DATA_DIR):
         os.makedirs(DATA_DIR)
-        call(['cp', '-r', MODULE_DATA_DIR, DATA_DIR])
+    for f in os.listdir(MODULE_DATA_DIR):
+        if not os.path.exists(os.path.join(DATA_DIR, f)):
+            call(['cp', '-r', os.path.join(MODULE_DATA_DIR, f), DATA_DIR])
     else:
         # Compare and warn if files in DATA_DIR are different
         dir_comp = dircmp(DATA_DIR, MODULE_DATA_DIR)
diff --git a/setup.py b/setup.py
index d522f5c..285c28e 100755
--- a/setup.py
+++ b/setup.py
@@ -75,6 +75,7 @@ setup(
         # that you indicate wheter you support Python2, Python 3 or both.
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 
     # What doesd your project relate to?
@@ -91,9 +92,8 @@ setup(
     install_requires=[
         'kerncraft',
         'networkx',
-        'numpy',
         'pyparsing',
-        'pygraphviz'
+        'pygraphviz',
     ],
     python_requires='>=3.5',