Merge pull request #157 from openworm/fix_install

Fix install

Former-commit-id: 5a350e0

Author: Travis Jacobs

INSTALL.md

@@ -1,31 +1,20 @@
 Installation
 ============
-Typically the steps below should be sufficient for a successful install:
+The recommended way to get PyOpenWorm is from [pip](http://pip.readthedocs.org/en/latest/installing.html):
 
-    git clone https://github.com/openworm/PyOpenWorm.git --recursive
-    cd PyOpenWorm
-    python setup.py install
-
-Alternatively, you can use [pip](http://pip.readthedocs.org/en/latest/installing.html):
+    pip install pyopenworm
 
-    pip install pyopenworm --pre
-    
 However, some users have experienced difficulty installing on Mac OSX. If the install
 fails when attempting to install lxml, you might try installing it separately before
 attempting to install PyOpenWorm. At least one user has found this [Stack Overflow](http://stackoverflow.com/questions/19548011/cannot-install-lxml-on-mac-os-x-10-9)
 post to be helpful.
 
-Optional
---------
-There is an optional database storeage option called Sleepycat. You may encounter these issues if you pursue this option:
-
-If your system does not come with bsddb, you will need to install it. On MacOSX, you can follow 
-[these instructions](http://stackoverflow.com/questions/16003224/installing-bsddb-package-python) for how to install 
-the python library.
+Alternatively, you can grab the contents from GitHub:
 
-If you don't have the Berkeley DB (necessary for using bsddb) you can get it from the [Oracle website](http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index-085366.html).
+    git clone https://github.com/openworm/PyOpenWorm.git
+    cd PyOpenWorm
+    python setup.py install
 
-    
 Uninstall
 ----------
 
@@ -37,3 +26,14 @@ Running tests
 After checking out the project, tests can be run on the command line with::
 
     python tests/test.py
+
+
+Optional
+--------
+There is an optional database storeage option called Sleepycat. You may encounter these issues if you pursue this option:
+
+If your system does not come with bsddb, you will need to install it. On MacOSX, you can follow 
+[these instructions](http://stackoverflow.com/questions/16003224/installing-bsddb-package-python) for how to install 
+the python library.
+
+If you don't have the Berkeley DB (necessary for using bsddb) you can get it from the [Oracle website](http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index-085366.html).

MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include OpenWormData *
+include post_install.py

PyOpenWorm/__init__.py

@@ -56,7 +56,7 @@
 .. automodule:: PyOpenWorm.configure
 """
 
-__version__ = '0.5.1'
+__version__ = '0.5.3'
 __author__ = 'Stephen Larson'
 
 import traceback, sys, os

setup.py

@@ -19,14 +19,14 @@ def run(self):
 ===========
 
 A unified, simple data access library in Python for data, facts, and models of
-*C. elegans* anatomy for the [OpenWorm project]http://www.openworm.org)
+*C. elegans* anatomy for the [OpenWorm project](http://www.openworm.org)
 
 What does it do?
 ----------------
 
 Enables a simple Python API for asking various questions about the cells of the
 *C. elegans*, enabling the sharing of data about *C. elegans* for the purpose
-of building a [data-to-model pipeline]http://docs.openworm.org/en/latest/projects
+of building a [data-to-model pipeline](http://docs.openworm.org/en/latest/projects
 for the OpenWorm project. In addition, it is a repository for various iterations
 of inferred / predicted data about *C. elegans*. Uncontroversial facts and
 inferred information are distinguished through the use of explicit Evidence
@@ -67,9 +67,12 @@ def run(self):
         'git://github.com/zopefoundation/ZODB.git#egg=ZODB',
     ],
     setup_requires = "six==1.9.0",
-    version = '0.5.1',
+    version = '0.5.3',
     packages = ['PyOpenWorm'],
-    package_data = {'PyOpenWorm':['default.conf']},
+    package_data = {
+        'PyOpenWorm':['default.conf']
+    },
+    include_package_data=True,
     author = 'OpenWorm.org authors and contributors',
     author_email = 'info@openworm.org',
     description = 'A Python library for working with OpenWorm data and models',