diff --git a/.travis.yml b/.travis.yml index cb687c790b..70c2251e84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ python: before_install: - sudo apt-get install liblapack-dev gfortran python-scipy libblas-dev libsuitesparse-dev swig - sudo ln -Tsf /{run,dev}/shm - - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.6.0-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.6.0-Linux-x86_64.sh -O miniconda.sh; fi + - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh; fi - chmod +x miniconda.sh - ./miniconda.sh -b - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then export PATH=/home/travis/miniconda/bin:$PATH; else export PATH=/home/travis/miniconda3/bin:$PATH; fi diff --git a/readme.md b/readme.md index 4c61e38276..638bfa4dda 100644 --- a/readme.md +++ b/readme.md @@ -35,9 +35,11 @@ Check out the [Tutorial](http://pymc-devs.github.io/pymc3/getting_started/)! The latest version of PyMC 3 can be installed from the master branch using pip: ``` -pip install git+https://github.com/pymc-devs/pymc3 +pip install --process-dependency-links git+https://github.com/pymc-devs/pymc3 ``` +The `--process-dependency-links` flag ensures that the developmental branch of Theano, which PyMC requires, is installed. If a recent developmental version of Theano has been installed with another method, this flag can be dropped. + Another option is to clone the repository and install PyMC using `python setup.py install` or `python setup.py develop`. **Note:** Running `pip install pymc` will install PyMC 2.3, not PyMC 3, from PyPI. diff --git a/setup.py b/setup.py index 3ff9404c06..bf20d02416 100755 --- a/setup.py +++ b/setup.py @@ -27,12 +27,14 @@ 'Operating System :: OS Independent'] install_reqs = ['numpy>=1.7.1', 'scipy>=0.12.0', 'matplotlib>=1.2.1', - 'Theano>=0.7.0'] + 'Theano<=0.7.1dev'] test_reqs = ['nose'] if sys.version_info[0] == 2: # py3 has mock in stdlib test_reqs.append('mock') +dep_links = ['https://github.com/Theano/Theano/tarball/master#egg=Theano-0.7.1dev'] + if __name__ == "__main__": setup(name=DISTNAME, version=VERSION, @@ -49,5 +51,6 @@ package_data = {'pymc3.examples': ['data/*.*']}, classifiers=classifiers, install_requires=install_reqs, + dependency_links=dep_links, tests_require=test_reqs, test_suite='nose.collector')