r23944 - /website/download.html -- June 13, 2014 - 17:50

Author: bugman
Date: Fri Jun 13 17:50:16 2014
New Revision: 23944

URL: http://svn.gna.org/viewcvs/relax?rev=23944&view=rev
Log:
Revert r23692 as SciPy is actually still used in the frame order analyses.

The command used was:
svn merge -r23692:r23691 .

.....
  r23692 | bugman | 2014-06-06 14:21:58 +0200 (Fri, 06 Jun 2014) | 5 lines
  Changed paths:
     M /website/download.html
  
  Removed all references to SciPy on the 
http://www.nmr-relax.com/download.html webpage.
  
  SciPy is no longer used in the frame order analysis.
.....


Modified:
    website/download.html

Modified: website/download.html
URL: 
http://svn.gna.org/viewcvs/relax/website/download.html?rev=23944&r1=23943&r2=23944&view=diff
==============================================================================
--- website/download.html       (original)
+++ website/download.html       Fri Jun 13 17:50:16 2014
@@ -75,6 +75,10 @@
 
       <p>The relax graphical user interface (GUI) is implemented using <a 
href="http://www.wxpython.org/";>wxPython</a>.  This package is essential if 
the GUI is to be used.  As wxPython currently does not support Python 3, you 
will need to use Python 2 to access the GUI.</p>
 
+      <h4>SciPy</h4>
+
+      <p>Numerical integration is required for the frame order theory.  This 
is currently not implemented within relax so the QUADPACK numerical 
integration provided by <a href="http://www.scipy.org/";>SciPy</a> is used.  
Without this package being installed, the frame order analysis will not be 
accessible.</p>
+
 
 <!-- GNU Linux -->
     <div id="GNU_Linux" class="main_h2">
@@ -117,6 +121,7 @@
           <ul class="main_ul">
             <li><a href="http://python.org";>Python</a> &gt;= 2.5: <a 
href="http://www.python.org/download/releases/2.7.7/";>Python 2.7.7 release 
page</a></li>
             <li><a href="http://numpy.scipy.org/";>NumPy</a> &gt;= 1.0.4: <a  
href="http://sourceforge.net/projects/numpy/files/NumPy/";>NumPy 
downloads</a></li>
+            <li><a href="http://www.scipy.org/";>SciPy</a> (optional) &gt;= 
0.7.1: <a  href="http://sourceforge.net/projects/scipy/files/scipy/";>SciPy 
downloads</a></li>
             <li><a href="http://www.wxpython.org/";>wxPython</a> (optional) 
&gt;= 2.8: <a href="http://www.wxpython.org/download.php#stable";>wxPython 
stable downloads</a></li>
           </ul>
 
@@ -152,6 +157,7 @@
           <ul class="main_ul">
             <li><a href="http://python.org";>Python</a> &gt;= 2.5: <a 
href="http://www.python.org/download/releases/2.7.7/";>Python 2.7.7 release 
page</a></li>
             <li><a href="http://numpy.scipy.org/";>NumPy</a> &gt;= 1.0.4: <a  
href="http://sourceforge.net/projects/numpy/files/NumPy/";>NumPy 
downloads</a></li>
+            <li><a href="http://www.scipy.org/";>SciPy</a> (optional) &gt;= 
0.7.1: <a  href="http://sourceforge.net/projects/scipy/files/scipy/";>SciPy 
downloads</a></li>
             <li><a 
href="https://pypi.python.org/pypi/pyreadline";>pyreadline</a> (optional): <a 
href="https://pypi.python.org/pypi/pyreadline";>pyreadline downloads</a></li>
             <li><a href="http://www.wxpython.org/";>wxPython</a> (optional) 
&gt;= 2.8: <a href="http://www.wxpython.org/download.php#stable";>wxPython 
stable downloads</a></li>
           </ul>
@@ -211,6 +217,7 @@
           <ul class="main_ul">
             <li><a href="http://python.org";>Python</a> &gt;= 2.5: <a 
href="http://www.python.org/download/releases/2.7.7/";>Python 2.7.7 release 
page</a></li>
             <li><a href="http://numpy.scipy.org/";>NumPy</a> &gt;= 1.0.4: <a  
href="http://sourceforge.net/projects/numpy/files/NumPy/";>NumPy 
downloads</a></li>
+            <li><a href="http://www.scipy.org/";>SciPy</a> (optional) &gt;= 
0.7.1: <a  href="http://sourceforge.net/projects/scipy/files/scipy/";>SciPy 
downloads</a></li>
             <li><a href="http://www.wxpython.org/";>wxPython</a> (optional) 
&gt;= 2.8: <a href="http://www.wxpython.org/download.php#stable";>wxPython 
stable downloads</a></li>
           </ul>
 
@@ -255,6 +262,7 @@
           <ul class="main_ul">
             <li><a href="http://python.org";>Python</a> &gt;= 2.5: <a 
href="http://www.python.org/download/releases/2.7.7/";>Python 2.7.7 release 
page</a></li>
             <li><a href="http://numpy.scipy.org/";>NumPy</a> &gt;= 1.0.4: <a  
href="http://sourceforge.net/projects/numpy/files/NumPy/";>NumPy 
downloads</a></li>
+            <li><a href="http://www.scipy.org/";>SciPy</a> (optional) &gt;= 
0.7.1: <a  href="http://sourceforge.net/projects/scipy/files/scipy/";>SciPy 
downloads</a></li>
             <li><a href="http://www.wxpython.org/";>wxPython</a> (optional) 
&gt;= 2.8: <a href="http://www.wxpython.org/download.php#stable";>wxPython 
stable downloads</a></li>
           </ul>