Since we are attempting to modernize the fink 10.7 distribution by
eliminating older legacy packages like gcc44/gcc45 and python25, it
would be nice to extend this to numeric-py whose functionality exists
in numpy-py/scipy-py via the oldnumeric modules and friends. For example,
I have ported pymol-py to use numpy-py/scipy-py with the patch...
diff -uNr pymol-1.4/contrib/pyopengl/_glumodule.c
pymol-1.4.scipy/contrib/pyopengl/_glumodule.c
--- pymol-1.4/contrib/pyopengl/_glumodule.c 2009-02-24 22:30:40.000000000
-0500
+++ pymol-1.4.scipy/contrib/pyopengl/_glumodule.c 2011-07-22
22:02:17.000000000 -0400
@@ -652,7 +652,7 @@
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
#elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
#include "numerical/arrayobject.h"
#else
diff -uNr pymol-1.4/contrib/pyopengl/_openglmodule.c
pymol-1.4.scipy/contrib/pyopengl/_openglmodule.c
--- pymol-1.4/contrib/pyopengl/_openglmodule.c 2009-02-24 22:30:40.000000000
-0500
+++ pymol-1.4.scipy/contrib/pyopengl/_openglmodule.c 2011-07-22
22:02:17.000000000 -0400
@@ -93,7 +93,7 @@
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
#elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
#include "numerical/arrayobject.h"
#else
diff -uNr pymol-1.4/contrib/pyopengl/openglutil.h
pymol-1.4.scipy/contrib/pyopengl/openglutil.h
--- pymol-1.4/contrib/pyopengl/openglutil.h 2009-02-24 22:30:40.000000000
-0500
+++ pymol-1.4.scipy/contrib/pyopengl/openglutil.h 2011-07-22
22:02:17.000000000 -0400
@@ -14,7 +14,7 @@
#elif defined(HAVE_EXTENSIONS_ARRAYOBJECT_H)
#include "Extensions/arrayobject.h"
#elif defined(HAVE_NUMERIC_ARRAYOBJECT_H)
-#include "Numeric/arrayobject.h"
+#include "numpy/oldnumeric.h"
#elif defined(HAVE_NUMERICAL_ARRAYOBJECT_H)
#include "numerical/arrayobject.h"
#else
diff -uNr pymol-1.4/modules/pymol/opengl/__init__.py
pymol-1.4.scipy/modules/pymol/opengl/__init__.py
--- pymol-1.4/modules/pymol/opengl/__init__.py 2009-02-24 22:29:21.000000000
-0500
+++ pymol-1.4.scipy/modules/pymol/opengl/__init__.py 2011-07-22
22:02:17.000000000 -0400
@@ -1,7 +1,9 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
# PyOpenGL: modified for usage inside of PyMOL
try:
- import multiarray
+ import numpy.oldnumeric as multiarray
_numeric = 1
except ImportError:
_numeric = 0
diff -uNr pymol-1.4/modules/pymol/opengl/gl/__init__.py
pymol-1.4.scipy/modules/pymol/opengl/gl/__init__.py
--- pymol-1.4/modules/pymol/opengl/gl/__init__.py 2009-02-24
22:29:21.000000000 -0500
+++ pymol-1.4.scipy/modules/pymol/opengl/gl/__init__.py 2011-07-22
22:02:17.000000000 -0400
@@ -1,3 +1,5 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
import sys
from pymol import opengl
@@ -13,7 +15,7 @@
"""
if opengl._numeric:
- from Numeric import ArrayType
+ from numpy.oldnumeric import ArrayType
try:
import _opengl_num
_opengl = _opengl_num
diff -uNr pymol-1.4/modules/pymol/opengl/glu/__init__.py
pymol-1.4.scipy/modules/pymol/opengl/glu/__init__.py
--- pymol-1.4/modules/pymol/opengl/glu/__init__.py 2009-02-24
22:29:21.000000000 -0500
+++ pymol-1.4.scipy/modules/pymol/opengl/glu/__init__.py 2011-07-22
22:02:17.000000000 -0400
@@ -1,9 +1,11 @@
+## Automatically adapted for numpy.oldnumeric Jul 09, 2010 by -c
+
# $Id: __init__.py 336 2001-02-24 12:11:45Z wdelano $
import sys
from pymol import opengl
if opengl._numeric:
- from Numeric import ArrayType
+ from numpy.oldnumeric import ArrayType
try:
import _glu_num
_glu = _glu_num
and the manual edits on the bundled pynmr of...
perl -pi -e 's|Numeric import|numpy.oldnumeric import|g' *.py
perl -pi -e 's|LinearAlgebra import|numpy.oldnumeric.linear_algebra import|g'
*.py
The same approach can be used for other packages which currently depend on
numeric-py.
Alternatively some packages, like pdb2pqr 1.7, have already been enhanced to
use either
numpy/scipy or Numeric if those can't be found.
Jack
------------------------------------------------------------------------------
Magic Quadrant for Content-Aware Data Loss Prevention
Research study explores the data loss prevention market. Includes in-depth
analysis on the changes within the DLP market, and the criteria used to
evaluate the strengths and weaknesses of these DLP solutions.
http://www.accelacomm.com/jaw/sfnl/114/51385063/
_______________________________________________
Fink-devel mailing list
[email protected]
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel
