Merge branch 'release/0.8.1'

Author: wmayner

.travis.yml

@@ -2,6 +2,11 @@ language: python
 
 sudo: false
 
+branches:
+  only:
+      - master
+      - develop
+
 # Setup databases
 services:
   - mongodb  # port 27017 (default)

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+
+0.8.1
+------------------
+_2016-02-11_
+
+### Fixes
+- Fixed a bug in `setup.py` that prevented installation.
+
+
 0.8.0
 ------------------
 _2016-02-06_

MANIFEST.in

@@ -1 +1,4 @@
-include README.rst LICENSE.md requirements.txt pyphi_config.yml redis.conf
+include README.rst 
+include LICENSE.md 
+include pyphi_config.yml 
+include redis.conf

install_requirements.txt

@@ -5,7 +5,7 @@
 """PyPhi metadata"""
 
 __title__ = 'pyphi'
-__version__ = '0.8.0'
+__version__ = '0.8.1'
 __description__ = 'Python library for computing integrated information.'
 __author__ = 'Will Mayner'
 __author_email__ = 'wmayner@gmail.com'

pyphi/__about__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# __init__.py
+# compute/__init__.py
 
 """Maintains backwards compatability with the old compute API."""
 

pyphi/compute/__init__.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# big_phi.py
+# compute/big_phi.py
 
 """
 Methods for computing concepts, constellations, and integrated information of

pyphi/compute/big_phi.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# concept.py
+# compute/concept.py
 
 import multiprocessing
 from time import time

pyphi/compute/concept.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# parallel.py
+# compute/parallel.py
 
 import multiprocessing
 

pyphi/compute/parallel.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# __init__.py
+# models/__init__.py
 
 from .big_phi import BigMip, _null_bigmip, _single_node_bigmip
 from .concept import Mip, _null_mip, Mice, Concept, Constellation