Author: bugman
Date: Fri Jun 6 18:03:05 2014
New Revision: 23710
URL: http://svn.gna.org/viewcvs/relax?rev=23710&view=rev
Log:
Merged revisions 23693 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r23693 | bugman | 2014-06-06 14:24:44 +0200 (Fri, 06 Jun 2014) | 6 lines
Removed all SciPy references in the installation chapter of the manual.
This is because SciPy is no longer used in the frame order analysis, hence
it is not used for any
part of relax.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/docs/latex/install.tex
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 6 18:03:05 2014
@@ -1 +1 @@
-/trunk:1-23688
+/trunk:1-23688,23693
Modified: branches/frame_order_cleanup/docs/latex/install.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/install.tex?rev=23710&r1=23709&r2=23710&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/latex/install.tex (original)
+++ branches/frame_order_cleanup/docs/latex/install.tex Fri Jun 6 18:03:05
2014
@@ -14,9 +14,6 @@
\item[\href{http://python.org/}{Python}\index{Python}:] Version 2.5 or
higher.
\item[\href{http://numpy.scipy.org/}{NumPy}\index{NumPy}:] Version 1.0.4
or higher.
This package is used for most of the numerical calculations within relax.
- \item[\href{http://www.scipy.org/}{SciPy}\index{SciPy}:] Version 0.7.1 or
higher.
- This package is optional.
- It is required only for the frame order theory analyses.
\item[\href{http://www.scipy.org/}{wxPython}\index{wxPython}:] Version
2.8 or higher.
This package is also optional.
It is required for the operation of the graphical user interface
(GUI)\index{User interface!GUI}.
@@ -140,7 +137,7 @@
If the desired version is not available, please download the relevant source
package below or contact the fink project using the ``Maintainer'' email
address given in the relax fink pages.
Note that when installing via fink, all the dependencies will be
automatically selected and installed as well.
-Although automatic, when starting from scratch that there could be well over
250 source packages that need to be compiled (to set up the full GNU
compilation chain and other libraries which are then required to build
Python, numpy, scipy, etc.).
+Although automatic, when starting from scratch that there could be well over
250 source packages that need to be compiled (to set up the full GNU
compilation chain and other libraries which are then required to build
Python, numpy, etc.).
This may take anywhere between 2 days to over a week (don't forget to
mention this fact to your poor sys-admin).
The fink relax packages for different Python versions are
\href{http://pdb.finkproject.org/pdb/package.php/relax-py27}{relax-py27},
\href{http://pdb.finkproject.org/pdb/package.php/relax-py26}{relax-py26},
\href{http://pdb.finkproject.org/pdb/package.php/relax-py25}{relax-py25} and
\href{http://pdb.finkproject.org/pdb/package.php/relax-py24}{relax-py24}.
r23710 - in /branches/frame_order_cleanup: ./ docs/latex/install.tex