Merge branch 'master' of github.com:mwhoffman/pybo2 into demos

.gitignore

@@ -1,5 +1,6 @@
 /pybo.egg-info/
 /build/
 /dist/
+/src/
 *.c
 *.so

.travis.yml

@@ -11,16 +11,20 @@ before_install:
     - "conda config --set always_yes yes --set changeps1 no"
     - "conda update -q conda"
     - "conda info -a"
-    - "conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip matplotlib atlas numpy scipy nose"
+    - "conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION pip nose atlas numpy scipy matplotlib"
     - "source activate test-environment"
     - "pip install python-coveralls"
 
 install:
-    - "pip install git+https://github.com/mwhoffman/{mwhutils,pygp}.git"
+    - "pip install -r requirements.txt"
 
 script:
-    - "nosetests  --with-coverage --cover-inclusive --cover-package=pybo"
+    - "nosetests"
 
 after_success:
     - "coveralls"
 
+notifications:
+    slack:
+        secure: "fv4kBsK5GJcNud81D67U7LM+Jwk7Gb3TsJ7gx4yEqe8is0yEfJqT/RhdaimG7XkYsnwYhzoQNcnvJVOMe3Qx7GrRfZgv54PHy29C7BQ2kyait8LaykaoouBaMY8oafjd1xlPJZWuwKj5bOOohFMZV8LB1HvnNmtcKyALAoOIkAU="
+

README.md

@@ -18,12 +18,20 @@ Installation
 
 The easiest way to install this package is by running
 
-    pip install git+https://github.com/mwhoffman/{mwhutils,pygp,pybo}.git
+    pip install -r https://github.com/mwhoffman/pybo/raw/master/requirements.txt
+    pip install git+https://github.com/mwhoffman/pybo.git
 
-from the command line. Alternatively the packages above can be installed by
-cloning their repositories and using `setup.py` directly. Once the package is
-installed the included demos can be run directly via python.  For example, by
-running
+The first line installs any dependencies of the package and the second line
+installs the package itself. Alternatively the repository can be cloned directly
+in order to make any local modifications to the code. In this case the
+dependencies can easily be installed by running
+
+    pip install -r requirements.txt
+
+from the main directory. The package itself can be installed by running `python
+setup.py` or by symlinking the directory into somewhere on the `PYTHONPATH`.
+Once the package is installed the included demos can be run directly via python.
+For example, by running
 
     python -m pybo.demos.beginner
 

requirements.txt

@@ -0,0 +1,5 @@
+numpy
+scipy
+matplotlib
+git+https://github.com/mwhoffman/mwhutils.git#egg=mwhutils
+git+https://github.com/mwhoffman/pygp.git#egg=pygp

setup.cfg

@@ -0,0 +1,4 @@
+[nosetests]
+with-coverage=1
+cover-inclusive=1
+cover-package=pybo

setup.py

@@ -12,4 +12,5 @@
       url='http://github.com/mwhoffman/pybo',
       license='Simplified BSD',
       packages=find_packages(),
-      package_data={'': ['*.txt', '*.npz']})
+      package_data={'': ['*.txt', '*.npz']},
+      install_requires=['numpy', 'scipy', 'matplotlib', 'mwhutils', 'pygp'])