Permalink
Browse files

Getting ready to release beta.

  • Loading branch information...
1 parent 421cd80 commit 0ba15d5181c6d70cdc354d7bebfa886107e142f4 @teoliphant teoliphant committed Sep 28, 2005
View
@@ -0,0 +1,11 @@
+recursive-include *.txt
+include MANIFEST.in
+include scipy/f2py2e/f2py.1
+recursive-include scipy/f2py2e *.cfg
+recursive-include scipy/f2py2e *.py
+recursive-include scipy/f2py2e/src fortranobject.c fortranobject.h
+recursive-include scipy/f2py2e/tests *.py
+recursive-include scipy/f2py2e/tests/mixed *.f *.f90
+#recursive-include scipy/f2py2e/doc *.py *.txt *.tex *.html Makefile
+recursive-include scipy/f2py2e/docs *.txt *.html *.dat *.f *.f90 *.pyf setup_example.py f2py_style.css
+
View
@@ -15,6 +15,7 @@
from scipy.fftpack import fft, ifft
import scipy.stats as stats
from scipy.stats import rand, randn
+ from core_version import version as __version__
except AttributeError, inst:
if inst.args[0] == "'module' object has no attribute 'typeinfo'":
pass
@@ -25,7 +25,7 @@ extern "C" {
#define PY_FAIL 0
#define PY_SUCCEED 1
-#define NUMERIC_VERSION 0x0400
+#define NDARRAY_VERSION 0x0400
/* Some platforms don't define bool, long long, or long double.
Handle that here.
View
@@ -35,6 +35,12 @@ def run():
print 'Failed to import numarray:',sys.exc_value
has_numarray = 0
try:
+ import scipy.base
+ has_newscipy = 1
+ except ImportError:
+ print 'Failed to import new scipy:', sys.exc_value
+ has_newscipy = 0
+ try:
import f2py2e
has_f2py2e = 1
except ImportError:
@@ -64,6 +70,13 @@ def run():
except Exception,msg:
print 'error:',msg
print '------'
+ if has_newscipy:
+ try:
+ print 'Found new scipy version %r in %s' % \
+ (scipy.__version__, scipy.__file__)
+ except Exception,msg:
+ print 'error:', msg
+ print '------'
if has_f2py2e:
try:
print 'Found f2py2e version %r in %s' % \
View
@@ -614,8 +614,10 @@ def run_compile():
if scipy_distutils_version[:5]>='0.4.0':
from scipy.distutils.system_info import get_info
+ using_newscipy=1
else:
from scipy_distutils.system_info import get_info
+ using_newscipy=0
num_include_dir = None
if using_numarray:
try:
@@ -628,6 +630,11 @@ def run_compile():
print 'Failed to import numarray:',sys.exc_value
raise ImportError,'Must have numarray installed.'
num_info = get_info('numarray')
+ elif using_newscipy:
+ import scipy
+ n = 'scipy'
+ p = get_prefix(scipy)
+ num_info = get_info('scipy')
else:
try:
import Numeric
View
@@ -211,13 +211,15 @@
\timport_array();
\tif (PyErr_Occurred())
\t\tPy_FatalError(\"can't initialize module #modulename# (failed to import _numpy)\");
-#if !defined(NUMARRAY)
+#if defined(NUMARRAY)
+\timport_libnumarray();
+#elseif defined(NDARRAY_VERSION)
+\timport_array();
+#else
\tif (PyImport_ImportModule(\"Numeric\")==NULL) {
\t\tPyErr_Print();
\t\tPy_FatalError(\"can't initialize module #modulename#\");
\t}
-#else
-\timport_libnumarray();
#endif
\td = PyModule_GetDict(m);
\ts = PyString_FromString(\"$R"""+"""evision: $\");
View
@@ -20,8 +20,9 @@
import os
import sys
-from distutils.core import setup
-from distutils.command.install_data import install_data
+from scipy.distutils.core import setup
+from scipy.distutils.command.install_data import install_data
+from scipy.distutils.misc_util import get_path
from __version__ import version
@@ -51,11 +52,19 @@ def f2py_py():
f.write(f2py_py())
f.close()
+
+def configuration(parent_package='',parent_path=None):
+ parent_path2 = parent_path
+ parent_path = parent_package
+ local_path = get_path(__name__,parent_path2)
+ config = Configuration('f2py2e',parent_package)
+ return config
+
if __name__ == "__main__":
print 'F2PY Version',version
- config = {}
+ config = configuration(parent_path='')
if sys.version[:3]>='2.3':
config['download_url'] = "http://cens.ioc.ee/projects/f2py2e/2.x"\
"/F2PY-2-latest.tar.gz"
View
@@ -6,8 +6,8 @@ def configuration(parent_package='',top_path=None):
config = Configuration('scipy',parent_package,top_path)
config.add_subpackage('distutils')
config.add_subpackage('weave')
- config.add_subpackage('f2py2e')
config.add_subpackage('test')
+ config.add_subpackage('f2py2e')
config.add_subpackage('base')
config.add_subpackage('lib',os.path.join(config.local_path,'corelib'))
config.add_subpackage('fftpack')

0 comments on commit 0ba15d5

Please sign in to comment.