From 0ae1eebb48460c1d5cc70e38425cec27c22ca787 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Thu, 3 Nov 2016 14:04:22 +0100
Subject: [PATCH] fix for py.test
---
wetb/fatigue_tools/rainflowcounting/compile.py | 7 ++++---
wetb/hawc2/ascii2bin/Example.py | 4 ++--
wetb/hawc2/ascii2bin/make_exe.py | 7 ++-----
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/wetb/fatigue_tools/rainflowcounting/compile.py b/wetb/fatigue_tools/rainflowcounting/compile.py
index ba45766..0c77dbd 100644
--- a/wetb/fatigue_tools/rainflowcounting/compile.py
+++ b/wetb/fatigue_tools/rainflowcounting/compile.py
@@ -5,6 +5,7 @@ from __future__ import absolute_import
from future import standard_library
standard_library.install_aliases()
from wetb.utils.cython_compile.cython_compile import cython_import
-cython_import('pair_range')
-cython_import('peak_trough')
-cython_import('rainflowcount_astm')
+if __name__=="__main__":
+ cython_import('pair_range')
+ cython_import('peak_trough')
+ cython_import('rainflowcount_astm')
diff --git a/wetb/hawc2/ascii2bin/Example.py b/wetb/hawc2/ascii2bin/Example.py
index 3878524..b0afee5 100644
--- a/wetb/hawc2/ascii2bin/Example.py
+++ b/wetb/hawc2/ascii2bin/Example.py
@@ -11,6 +11,6 @@ from future import standard_library
standard_library.install_aliases()
from wetb.hawc2.ascii2bin.ascii2bin import ascii2bin
-
-ascii2bin(r"tests/hawc2ascii.sel", "temp_hawc2ascii.sel")
+if __name__=="__main__":
+ ascii2bin(r"tests/hawc2ascii.sel", "temp_hawc2ascii.sel")
diff --git a/wetb/hawc2/ascii2bin/make_exe.py b/wetb/hawc2/ascii2bin/make_exe.py
index 7e31b83..f83d484 100644
--- a/wetb/hawc2/ascii2bin/make_exe.py
+++ b/wetb/hawc2/ascii2bin/make_exe.py
@@ -7,10 +7,7 @@ from __future__ import division, print_function, absolute_import, unicode_litera
from future import standard_library
standard_library.install_aliases()
from build_exe.cx.build_cx_exe import NUMPY
-try: range = xrange; xrange = None
-except NameError: pass
-try: str = unicode; unicode = None
-except NameError: pass
from build_exe.cx import build_cx_exe
-build_cx_exe.build_exe("ascii2bin.py", version="3.0.1", includes=["'pandas'"], modules=['email', NUMPY])
+if __name__=="__main__":
+ build_cx_exe.build_exe("ascii2bin.py", version="3.0.1", includes=["'pandas'"], modules=['email', NUMPY])
--
GitLab