From da9c0695d00ca7ba68a8304417154399c2580f24 Mon Sep 17 00:00:00 2001 From: "Per.Andreas.Brodtkorb" Date: Wed, 13 Oct 2010 14:50:45 +0000 Subject: [PATCH] Fixed a bug in setup.py Added functions to __all__ variable in stats.core.py --- pywafo/setup.py | 14 ++++++++------ pywafo/src/Wafo.egg-info/PKG-INFO | 2 +- pywafo/src/Wafo.egg-info/SOURCES.txt | 1 + pywafo/src/wafo/stats/core.py | 3 ++- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pywafo/setup.py b/pywafo/setup.py index 36efd1a..49608ba 100644 --- a/pywafo/setup.py +++ b/pywafo/setup.py @@ -19,15 +19,16 @@ import os import sys import subprocess import re +import warnings MAJOR = 0 MINOR = 1 -MICRO = 1 -ISRELEASED = False +MICRO = 2 +ISRELEASED = True VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) -sys.argv.append("develop") +#sys.argv.append("develop") #sys.argv.append("install") DISTUTILS_DEBUG = True pkg_name = 'wafo' @@ -83,7 +84,7 @@ short_version='%(version)s' version='%(version)s' release=%(isrelease)s """ - fid = open(os.path.join(rootdir,filename), 'w') + fid = open(os.path.join(root_dir,filename), 'w') try: fid.write(cnt % {'version': VERSION, 'isrelease': str(ISRELEASED)}) finally: @@ -93,8 +94,9 @@ if __name__=='__main__': write_version_py() packages = find_packages('src') - package_paths =[p.replace(pkg_name,+'.','').replace(pkg_name,'').replace('.',os.path.sep) - for p in packages] + for p in packages: + print(p) + package_paths =[p.replace(pkg_name+'.','').replace(pkg_name,'').replace('.',os.path.sep) for p in packages] test_paths = [os.path.join(pkg_path,'test') for pkg_path in package_paths if os.path.exists(os.path.join(root_dir,pkg_path,'test'))] testscripts = [os.path.join(subtst, f) for subtst in test_paths diff --git a/pywafo/src/Wafo.egg-info/PKG-INFO b/pywafo/src/Wafo.egg-info/PKG-INFO index 6c9f910..702014c 100644 --- a/pywafo/src/Wafo.egg-info/PKG-INFO +++ b/pywafo/src/Wafo.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: wafo -Version: 0.11 +Version: 0.1.2 Summary: UNKNOWN Home-page: http://code.google.com/p/pywafo/ Author: WAFO-group diff --git a/pywafo/src/Wafo.egg-info/SOURCES.txt b/pywafo/src/Wafo.egg-info/SOURCES.txt index 28a12be..8871d8b 100644 --- a/pywafo/src/Wafo.egg-info/SOURCES.txt +++ b/pywafo/src/Wafo.egg-info/SOURCES.txt @@ -33,6 +33,7 @@ src/wafo/polynomial.py src/wafo/polynomial_old.py src/wafo/rindmod.pyd src/wafo/sg_filter.py +src/wafo/version.py src/wafo/wafodata.py src/wafo.egg-info/SOURCES.txt src/wafo/covariance/__init__.py diff --git a/pywafo/src/wafo/stats/core.py b/pywafo/src/wafo/stats/core.py index 3718a65..460e59f 100644 --- a/pywafo/src/wafo/stats/core.py +++ b/pywafo/src/wafo/stats/core.py @@ -9,7 +9,8 @@ from numpy import atleast_1d, nan, ndarray, sqrt, vstack, ones, where, zeros from numpy import arange, floor, linspace, asarray, reshape, repeat, product -__all__ = ['edf', 'edfcnd'] +__all__ = ['edf', 'edfcnd','reslife', 'dispersion_idx','decluster','findpot', + 'declustering_time','extremal_idx'] arr = asarray