Merge branch 'master' into feature/include-six

Conflicts:
	.travis.yml
	distarray/client.py
	distarray/local/denselocalarray.py
	distarray/odin.py
	distarray/tests/test_client.py
	examples/odin_demo.py

.gitignore

@@ -107,4 +107,4 @@ dist
 
 # Coverage related files #
 ##########################
-.coverage
+.coverage*

.travis.yml

@@ -6,10 +6,13 @@ before_install:
     - sudo apt-get update
     - sudo apt-get install libopenmpi-dev
     - sudo apt-get install openmpi-bin
+    - sudo apt-get install libhdf5-openmpi-dev
     - pip install numpy
     - pip install pyzmq --install-option="--zmq=bundled"
     - pip install ipython
     - pip install mpi4py --allow-all-external --allow-unverified mpi4py
+    - pip install cython
+    - CC=mpicc pip install git+https://github.com/h5py/h5py.git --install-option="--mpi"
     - pip install sphinx
     - pip install sphinxcontrib-napoleon
     - pip install coverage
@@ -21,8 +24,9 @@ install:
 before_script:
     - (cd $TRAVIS_BUILD_DIR && make setup_cluster)
 script:
-    - (cd $TRAVIS_BUILD_DIR && make test)
+    - (cd $TRAVIS_BUILD_DIR && make test_with_coverage)
 after_script:
     - (cd $TRAVIS_BUILD_DIR && make teardown_cluster)
 after_success:
+    - coverage combine
     - coveralls

COPYING.rst

@@ -1,4 +1,4 @@
-Copyright (c) 2008, IPython Development Team
+Copyright (c) 2008-2014, IPython Development Team and Enthought, Inc.
 
 All rights reserved.
 
@@ -12,7 +12,7 @@ Redistributions in binary form must reproduce the above copyright notice, this l
 of conditions and the following disclaimer in the documentation and/or other
 materials provided with the distribution.
 
-Neither the name of the IPython Development Team nor the names of its contributors
+Neither the names of the copyright holders nor the names of their contributors
 may be used to endorse or promote products derived from this software without
 specific prior written permission.
 
@@ -26,47 +26,3 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY
 WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
-About the IPython Development Team
-----------------------------------
-
-The IPython Development Team is the set of all contributors to the IPython project.
-This includes all of the IPython subprojects. Here is a list of the contributors:
-
-    * Matthieu Brucher
-    * Ondrej Certik
-    * Laurent Dufrechou
-    * Robert Kern
-    * Brian E. Granger
-    * Fernando Perez (project leader)
-    * Benjamin Ragan-Kelley
-    * Ville M. Vainio
-    * Gael Varoququx
-    * Stefan van der Walt
-    * Tech-X Corporation
-    * Barry Wark
-
-If your name is missing, please add it.
-
-Our Copyright Policy
---------------------
-
-IPython uses a shared copyright model. Each contributor maintains copyright over
-their contributions to IPython. But, it is important to note that these
-contributions are typically only changes to the repositories. Thus, the IPython
-source code, in its entirety is not the copyright of any single person or
-institution. Instead, it is the collective copyright of the entire IPython
-Development Team. If individual contributors want to maintain a record of what
-changes/contributions they have specific copyright on, they should indicate their
-copyright in the commit message of the change, when they commit the change to
-one of the IPython repositories.
-
-With this in mind, the following banner should be used in any source code file to indicate the copyright and license terms:
-
-#-----------------------------------------------------------------------------
-#  Copyright (C) 2008  The IPython Development Team
-#
-#  Distributed under the terms of the BSD License.  The full license is in
-#  the file COPYING, distributed as part of this software.
-#-----------------------------------------------------------------------------
-

Makefile

@@ -1,29 +1,52 @@
-.PHONY: clean setup_cluster test test_travis teardown_cluster
-
 PYTHON = python
 MPIEXEC = mpiexec
 COVERAGE = coverage
 
 develop:
 	${PYTHON} setup.py develop
+.PHONY: develop
 
 install:
 	${PYTHON} setup.py install
+.PHONY: install
 
 setup_cluster:
 	-${PYTHON} distarray/tests/ipcluster.py 'start()'
+.PHONY: setup_cluster
+
+test_client:
+	${PYTHON} -m unittest discover -v
+.PHONY: test_client
+
+test_client_with_coverage:
+	${COVERAGE} run -pm unittest discover -v
+.PHONY: test_client_with_coverage
+
+test_engines:
+	${MPIEXEC} -n 12 ${PYTHON} -m unittest discover -s distarray/local/tests -p 'paralleltest*.py'
+.PHONY: test_engines
+
+test_engines_with_coverage:
+	${MPIEXEC} -n 12 ${COVERAGE} run -pm unittest discover -s distarray/local/tests -p 'paralleltest*.py'
+.PHONY: test_engines_with_coverage
+
+test: test_client test_engines
+.PHONY: test
 
-test:
-	${COVERAGE} run -m unittest discover
-	${MPIEXEC} -n 12 ${PYTHON} -m unittest discover -s distarray/local/tests -p 'paralleltest*.py' 
+test_with_coverage: test_client_with_coverage test_engines_with_coverage
+.PHONY: test_with_coverage
 
-report:
+coverage_report:
+	${COVERAGE} combine
 	${COVERAGE} html
+.PHONY: coverage_report
 
 teardown_cluster:
 	-${PYTHON} distarray/tests/ipcluster.py 'stop()'
+.PHONY: teardown_cluster
 
 clean:
 	-${PYTHON} setup.py clean --all
 	-find . \( -iname '*.py[co]' -or -iname '*.so' -or -iname '__pycache__' \) -exec ${RM} -r '{}' +
 	-${RM} -r build MANIFEST dist distarray.egg-info coverage_report
+.PHONY: clean

README.rst

@@ -1,4 +1,4 @@
-.. image:: https://travis-ci.org/enthought/distarray.png
+.. image:: https://travis-ci.org/enthought/distarray.png?branch=master   
    :target: https://travis-ci.org/enthought/distarray
 
 .. image:: https://coveralls.io/repos/enthought/distarray/badge.png?branch=master

benchmarks/benchmark.py

@@ -5,7 +5,7 @@
 __docformat__ = "restructuredtext en"
 
 #----------------------------------------------------------------------------
-#  Copyright (C) 2008  The IPython Development Team
+#  Copyright (C) 2008-2014, IPython Development Team and Enthought, Inc.
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.

distarray/__init__.py

@@ -3,7 +3,7 @@
 __docformat__ = "restructuredtext en"
 
 #----------------------------------------------------------------------------
-#  Copyright (C) 2008  The IPython Development Team
+#  Copyright (C) 2008-2014, IPython Development Team and Enthought, Inc.
 #
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
@@ -13,10 +13,5 @@
 # Imports
 #----------------------------------------------------------------------------
 
-from distarray import error
-from distarray.error import *
-from distarray import mpiutils
-from distarray.mpiutils import *
-from distarray import local
-from distarray.local import *
-
+from distarray.client import DistArray
+from distarray.context import Context