Update instructions since pip has removed the --process-dependency-li…

…nks option (gwastro#1201) * Tell pip to bring in all the dependencies * Fixed typo that hid instructions to update pip * Point to new DASWG repository page * removed link as process dependency links has been removed from pip * fix instructions to remove process-dependency-links * removed deprecated dependency_links * get mpld3 from pypi
hagabbar · May 23, 2017 · 43ecc39 · 43ecc39
1 parent 76a76c3
commit 43ecc39
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/docs/install.rst b/docs/install.rst
@@ -135,6 +135,7 @@ If you are running on a Scientific Linux 6 cluster, you need to install the HDF5
 Make sure your versions of ``pip`` and ``setuptools`` are up to date by running the command:
 
 .. code-block:: bash
+
     pip install --upgrade pip setuptools
 
 Install unittest2, python-cjson, and numpy with the command:

diff --git a/docs/install_lalsuite.rst b/docs/install_lalsuite.rst
@@ -10,7 +10,7 @@ The following page describes how to build lalsuite from source for use with PyCB
 
     These instructions assume that you already have the required dependencies for lalsuite installed on your system. You must have ``git``, ``FFTW``, ``GSL``, ``FrameL``, and ``MetaIO`` installed before continuing. 
 
-    These packages are installed by default on a LIGO Data Grid cluster. If you are not on a LIGO Data Grid cluster, then you can download them from the `lscsoft repository <https://www.lsc-group.phys.uwm.edu/daswg/download/repositories.html>`_ or see the `lscsoft install instructions <https://www.lsc-group.phys.uwm.edu/daswg/docs/howto/lscsoft-install.html>`_ for instructions on building the dependencies from source. You can also contact your system administrator to determine if these packages are available using the ``module load`` command.
+    These packages are installed by default on a LIGO Data Grid cluster. If you are not on a LIGO Data Grid cluster, then you can download them from the `lscsoft repository <https://wiki.ligo.org/DASWG/SoftwareDownloads>`_ or see the `lscsoft install instructions <https://www.lsc-group.phys.uwm.edu/daswg/docs/howto/lscsoft-install.html>`_ for instructions on building the dependencies from source. You can also contact your system administrator to determine if these packages are available using the ``module load`` command.
 
 ====================================================
 Obtaining the source code and checking out a version

diff --git a/setup.py b/setup.py
@@ -62,15 +62,14 @@
                       'pillow',
                       'h5py>=2.5',
                       'jinja2',
-                      'mpld3>=0.3git',
+                      'pycbc-mpld3>=0.3.dev0',
                       'pyRXP>=2.1.0',
                       'pycbc-glue>=0.9.8',
                       'kombine',
                       'emcee>=2.2.0',
                       'corner>=2.0.1',
                       #'scikit-learn>=0.17.0',  # travis does not like scikit-learn
                       ]
-links = ['https://github.com/ligo-cbc/mpld3/tarball/master#egg=mpld3-0.3git']
 
 #FIXME Remove me when we bump to h5py > 2.5
 try:
@@ -354,7 +353,6 @@ def run(self):
     setup_requires = setup_requires,
     extras_require = extras_require,
     install_requires = install_requires,
-    dependency_links = links,
     scripts  = [
                'bin/minifollowups/pycbc_injection_minifollowup',
                'bin/minifollowups/pycbc_foreground_minifollowup',