Merge 9c67b84 into 5be2017

readme.md

@@ -39,10 +39,18 @@ PyMC3 is Beta software. Users should consider using [PyMC 2 repository](https://
 The latest version of PyMC3 can be installed from the master branch using pip:
 
 ```
-pip install --process-dependency-links git+https://github.com/pymc-devs/pymc3
+pip install git+https://github.com/pymc-devs/pymc3
 ```
 
-The `--process-dependency-links` flag ensures that the developmental branch of Theano, which PyMC3 requires, is installed. If a recent developmental version of Theano has been installed with another method, this flag can be dropped.
+To ensure the development branch of Theano is installed alongside PyMC3 (recommended), you can install PyMC3 using the `requirements.txt` file. This requires cloning the repository to your computer:
+
+```
+git clone https://github.com/pymc-devs/pymc3
+cd pymc3
+pip install -r requirements.txt
+```
+
+However, if a recent version of Theano has already been installed on your system, you can install PyMC3 directly from GitHub.
 
 Another option is to clone the repository and install PyMC3 using `python setup.py install` or `python setup.py develop`.
 

requirements.txt

@@ -0,0 +1,7 @@
+numpy>=1.7.1
+scipy>=0.12.0
+matplotlib>=1.2.1
+theano>=0.8.2
+pandas>=0.15.0
+patsy>=0.4.0
+joblib>=0.9         

setup.py

@@ -26,16 +26,16 @@
                'Topic :: Scientific/Engineering :: Mathematics',
                'Operating System :: OS Independent']
 
-install_reqs = ['numpy>=1.7.1', 'scipy>=0.12.0', 'matplotlib>=1.2.1',
-                'Theano>=0.7.1dev', 'pandas>=0.15.0', 'patsy>=0.4.0', 'joblib>=0.9']
+with open('requirements.txt') as f:
+    install_reqs = f.read().splitlines()
+
 if sys.version_info < (3, 4):
     install_reqs.append('enum34')
 
 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']
 
 if __name__ == "__main__":
     setup(name=DISTNAME,
@@ -53,6 +53,5 @@
           package_data = {'pymc3.examples': ['data/*.*']},
           classifiers=classifiers,
           install_requires=install_reqs,
-          dependency_links=dep_links,
           tests_require=test_reqs,
           test_suite='nose.collector')