Move avocado_settings.py to main directory

kboone · Apr 23, 2019 · 391d7ab · 391d7ab
1 parent 91c4c7f
commit 391d7ab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/avocado/settings.py b/avocado/settings.py
@@ -7,7 +7,8 @@
 import os
 
 # Figure out the root directory for our package.
-package_root_directory = os.path.dirname(os.path.abspath(__file__))
+dirname = os.path.dirname
+package_root_directory = dirname(dirname(os.path.abspath(__file__)))
 
 # First, load the default settings
 default_path = os.path.join(package_root_directory, 'avocado_settings.json')

diff --git a/avocado/avocado_settings.json → avocado_settings.json b/avocado/avocado_settings.json → avocado_settings.json
diff --git a/setup.py b/setup.py
@@ -10,6 +10,5 @@
     author_email='kboone@berkeley.edu',
     license='BSD',
     packages=['avocado'],
-    data_files=[('avocado', ['avocado/avocado_settings.json'])]
-
+    data_files=[('', ['avocado_settings.json'])]
 )