Merge branch 'release/0.8.1'

.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

pyphi/__about__.py

@@ -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__ = '[email protected]'

pyphi/compute/__init__.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/big_phi.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/concept.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/parallel.py

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

pyphi/models/__init__.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

pyphi/models/big_phi.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# big_phi.py
+# models/big_phi.py
 
 
 from .. import utils, config, jsonify

pyphi/models/cmp.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# cmp.py
+# models/cmp.py
 
 """
 Utilities for comparing phi-objects.

pyphi/models/concept.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# concept.py
+# models/concept.py
 
 from collections import namedtuple
 

pyphi/models/cuts.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-# cuts.py
+# models/cuts.py
 
 from collections import namedtuple
 

requirements.txt

@@ -1,5 +1,3 @@
-# TODO: freeze dependencies
-
--r install_requirements.txt
+-e .
 -r test_requirements.txt
 -r dev_requirements.txt

setup.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-
 # setup.py
 
 try:
@@ -18,21 +17,15 @@
 install_requires = [
     'numpy >=1.8.1, <2.0.0',
     'scipy >=0.13.3, <1.0.0',
-    'pyemd >=0.0.7, <1.0.0',
+    'pyemd >=0.2.0, <1.0.0',
     'joblib >=0.8.0a3, <1.0.0',
-    'psutil >= 2.1.1, <3.0.0',
+    'psutil >=2.1.1, <3.0.0',
     'marbl-python >=2.0.0, <3.0.0',
     'pymongo >=2.7.1, <3.0.0',
     'pyyaml >=3.11, <4.0',
     'redis >=2.10.5, <3.0.0'
 ]
 
-test_require = [
-    'pytest',
-    'coverage',
-    'sphinx_rtd_theme'
-]
-
 setup(
     name=about['__title__'],
     version=about['__version__'],
@@ -44,9 +37,7 @@
     long_description=readme,
     include_package_data=True,
     install_requires=install_requires,
-    tests_require=test_require,
-    test_suite='test',
-    packages=['pyphi'],
+    packages=['pyphi', 'pyphi.compute', 'pyphi.models'],
     package_data={'pyphi': ['data/**/*'],
                   '': ['README.rst', 'LICENSE.md', 'pyphi_config.yml',
                        'redis.conf']},