Author: bugman
Date: Thu Jul 3 14:55:10 2014
New Revision: 24431
URL: http://svn.gna.org/viewcvs/relax?rev=24431&view=rev
Log:
Merged revisions 24425,24428 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r24425 | bugman | 2014-07-03 13:25:59 +0200 (Thu, 03 Jul 2014) | 10 lines
Updated the Mac OS X framework setting up instruction document.
New sections have been added for the nose and matplotlib Python packages,
as nose is needed for the
numpy and scipy testing frameworks and matplotlib might be a useful
optional dependency in the
future.
The mpy4py section has been updated to avoid the non-framework fink version
of mpicc which cannot
produce universal binaries. A few other parts also have small edits.
........
r24428 | bugman | 2014-07-03 14:22:30 +0200 (Thu, 03 Jul 2014) | 6 lines
Removed the Freecode section from the release checklist as Freecode has
been permanently shut down.
The old relax links are still there
(http://freecode.com/projects/nmr-relax), but Freecode is dead
(http://freecode.com/about).
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/docs/Mac_framework_build_3way
branches/frame_order_cleanup/docs/Release_Checklist
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 3 14:55:10 2014
@@ -1 +1 @@
-/trunk:1-24422
+/trunk:1-24430
Modified: branches/frame_order_cleanup/docs/Mac_framework_build_3way
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/Mac_framework_build_3way?rev=24431&r1=24430&r2=24431&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/Mac_framework_build_3way (original)
+++ branches/frame_order_cleanup/docs/Mac_framework_build_3way Thu Jul 3
14:55:10 2014
@@ -43,6 +43,16 @@
+# Nose.
+
+This is needed for numpy and scipy testing via the numpy.test() and
scipy.test() functions. Download the latest version from
https://pypi.python.org/pypi/nose, unpack it and type:
+
+$ ~/bin/python2.7 setup.py install
+
+Do not use pip or easy_install!
+
+
+
# Mpi4py.
The deployment target platform, SDK root, and the architectures need to be
set explicitly with environmental variables:
@@ -53,7 +63,9 @@
This is probably because mpicc is dumber than gcc! Make sure that there is
no 'build' directory prior to compilation. Finally, run:
-$ ~/bin/python2.7 setup.py install
+$ PATH=/usr/bin/:$PATH ~/bin/python2.7 setup.py install
+
+The PATH change is required here just in case the non-framework Fink mpicc
compiler is installed.
@@ -98,7 +110,7 @@
-# wxPython 2.9.
+# wxPython >= 2.9.
Download and unpack the latest source release. In the base directory, type:
@@ -109,11 +121,11 @@
# SCons.
-Download and unpack the latest 2.x.x release, then type:
+Download and unpack the latest release, then type:
$ ~/bin/python2.7 setup.py install
$ cd ~/bin
-$ ln -s
/Users/edward/Library/Frameworks/Python.framework/Versions/2.7/bin/scons-2.x.x
scons
+$ ln -s
/Users/edward/Library/Frameworks/Python.framework/Versions/2.7/bin/scons scons
Then edit the scons file and change the top of the file from:
@@ -130,8 +142,17 @@
#
+
# Py2app.
This is needed to create the universal binary DMG distribution file.
Download the latest version from https://pypi.python.org/pypi/py2app/. Then
open it and:
$ ~/bin/python2.7 setup.py install
+
+
+
+# Matplotlib.
+
+This might be used more in relax in the future. Download the latest version
and then:
+
+$ ~/bin/python2.7 setup.py install
Modified: branches/frame_order_cleanup/docs/Release_Checklist
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/Release_Checklist?rev=24431&r1=24430&r2=24431&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/Release_Checklist (original)
+++ branches/frame_order_cleanup/docs/Release_Checklist Thu Jul 3 14:55:10
2014
@@ -198,9 +198,3 @@
--------------
For the news item, firstly cut and paste the mailing list message. Item
references such as bug #7641, task #3122, etc. are automatically converted
into links. Create three sections using the Savane markup (recipe #236).
Call these = Description =, = Download =, and = Full list of changes =. For
the last section, use the subtitles == Features == , == Changes == , and ==
Bugfixes ==. The items in this section start with '* ' to create an
unnumbered list. Strip all leading whitespace from the full list of changes
and remove all the links to the trackers (as these will be automatically
created).
-
-
-Freecode message
-----------------
-
-For Freecode (http://freecode.com, formally Freshmeat), go to the relax
project page at http://freecode.com/projects/nmr-relax. Click on 'All
releases' in the 'Recent releases' section, then on 'Submit new release'.
Add the version number, a brief and concise summary of the release,
type/select the release focus category, and update the distribution package
URLs.
r24431 - in /branches/frame_order_cleanup: ./ docs/Mac_framework_build_3way docs/Release_Checklist