Merge branch 'scipy015' into develop

.travis.yml

@@ -1,17 +1,20 @@
-# Config file for automatic testing at travis-ci.org
 language: python
-
-before_install:
-  - sudo apt-get install -qq python-numpy python-scipy
-
 python:
-- "2.7_with_system_site_packages"
-
+  - "2.7"
+before_install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq libatlas-dev libatlas-base-dev liblapack-dev gfortran
+  - wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh
+  - chmod +x miniconda.sh
+  - ./miniconda.sh -b
+  - export PATH=/home/travis/miniconda/bin:$PATH
+  - conda update --yes conda
+  - travis_retry conda install --yes python=$TRAVIS_PYTHON_VERSION pip numpy scipy
 install:
-- pip install coveralls
-- pip install -r requirements.txt
-
+  - travis_retry pip install coveralls
+  - travis_retry pip install -r requirements.txt
 # command to run tests, e.g. python setup.py test
 script: coverage run --source abcpmc setup.py test
 after_success:
     coveralls
+

README.rst

@@ -2,6 +2,9 @@
 abcpmc
 =============================
 
+.. image:: https://badge.fury.io/py/abcpmc.png
+    :target: http://badge.fury.io/py/abcpmc
+
 .. image:: https://travis-ci.org/jakeret/abcpmc.png?branch=master
         :target: https://travis-ci.org/jakeret/abcpmc
 
@@ -15,8 +18,9 @@ A Python Approximate Bayesian Computing (ABC) Population Monte Carlo (PMC) imple
    :alt: approximated 2d posterior (created with triangle.py).
    :align: center
 
-
-The development is coordinated on `GitHub <http://github.com/jakeret/abcpmc>`_ and contributions are welcome. The documentation of `abcpmc` is available at `RTD <http://abcpmc.readthedocs.org/>`_.
+The **abcpmc** package has been developed at ETH Zurich in the `Software Lab of the Cosmology Research Group <http://www.cosmology.ethz.ch/research/software-lab.html>`_ of the `ETH Institute of Astronomy <http://www.astro.ethz.ch>`_. 
+
+The development is coordinated on `GitHub <http://github.com/jakeret/abcpmc>`_ and contributions are welcome. The documentation of **abcpmc** is available at `readthedocs.org <http://abcpmc.readthedocs.org/>`_.
 
 Features
 --------

requirements.txt

@@ -1,5 +1,5 @@
 numpy
-scipy
+scipy>=0.15.0
 Sphinx>=1.2.3
 mock>=1.0.1
 pytest>=2.6.3

setup.py

@@ -37,7 +37,7 @@ def run_tests(self):
 
 history = open('HISTORY.rst').read().replace('.. :changelog:', '')
 
-requires = ["numpy", "scipy"] #during runtime
+requires = ["numpy", "scipy>=0.15"] #during runtime
 tests_require=['pytest>=2.3', 'mock'] #for testing
 
 PACKAGE_PATH = os.path.abspath(os.path.join(__file__, os.pardir))
@@ -49,7 +49,7 @@ def run_tests(self):
     long_description=readme + '\n\n' + doclink + '\n\n' + history,
     author='Joel Akeret',
     author_email='jakeret@phys.ethz.ch',
-    url='http://www.cosmology.ethz.ch/research/software-lab.html',
+    url='http://www.cosmology.ethz.ch/research/software-lab/abcpmc.html',
     packages=find_packages(PACKAGE_PATH, "test"),
     package_dir={'abcpmc': 'abcpmc'},
     include_package_data=True,