fixed example data path

asntech · Feb 9, 2017 · 2b3150a · 2b3150a
1 parent f966c19
commit 2b3150a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,5 @@
 include README.md
 exclude .gitignore
-include intervene/example_data/*.*
+include intervene/example_data/*.*
+include intervene/example_data/dbSUPER_mm9/*.*
+include intervene/example_data/ENCODE_hESC/*.*
diff --git a/docs/install.rst b/docs/install.rst
@@ -58,7 +58,9 @@ Or install with conda
 
 Install required R packages
 ---------------------------
-Intervene rquires two R packages, ``UpSetR`` and ``corrplot`` for visualization.
+Intervene rquires two R packages, ``UpSetR`` https://cran.r-project.org/package=UpSetR
+ and ``corrplot`` https://cran.r-project.org/package=corrplot
+ for visualization.
 
 .. code-block:: R
 

diff --git a/intervene/__init__.py b/intervene/__init__.py
@@ -1 +1 @@
-__version__ = '0.37'
+__version__ = '0.38'
diff --git a/intervene/intervene b/intervene/intervene
@@ -17,13 +17,10 @@ from intervene.modules.pairwise import pairwise
 from intervene.modules.upset import upset
 from intervene.modules.venn import list_venn, genomic_venn
 from intervene import helpers
-
 from argparse import ArgumentParser, RawTextHelpFormatter
+from intervene import __version__, __file__
 
 
-
-from intervene import __version__
-
 def create_dir(dir_path):
     '''
     Create a output directory if it's not exists.
@@ -81,6 +78,7 @@ def data_dir():
     """
     Returns the data directory that contains example files.
     """
+    #data_path = os.path.dirname(intervene.__file__)
     return os.path.join(os.path.dirname(__file__), 'example_data')
 
 

diff --git a/setup.py b/setup.py
@@ -62,7 +62,7 @@ def readme(fname):
 
     scripts=['intervene/intervene','intervene/scripts/upset_plot_intervene.R','intervene/scripts/heatmap_intervene.R',
                    ],
-    package_data={'intervene': ['intervene/example_data/*.*']},
+    package_data={'intervene': ['intervene/example_data/*.*', 'intervene/example_data/dbSUPER_mm9/*.*', 'intervene/example_data/ENCODE_hESC/*.*']},
     include_package_data=True,
     install_requires = install_requires,
     classifiers=CLASSIFIERS,