Index: wflow-py/_version.py =================================================================== diff -u -r1221929552575774995e54f8057e28b3b3375cbb -r75aadcfa92e69e147c7a6f78b333e649dd85ca0e --- wflow-py/_version.py (.../_version.py) (revision 1221929552575774995e54f8057e28b3b3375cbb) +++ wflow-py/_version.py (.../_version.py) (revision 75aadcfa92e69e147c7a6f78b333e649dd85ca0e) @@ -1,4 +1,4 @@ VERSION="1.0.master.1" MVERSION="1.0.master" NVERSION="1.0.1" -BUILD="2016-11-15 19:46:57.535519" +BUILD="2016-11-16 14:37:38.404000" Index: wflow-py/make_wflow_exe_cx.py =================================================================== diff -u -rdbe26189b20a8577fbf0c7c1919147350530f2b4 -r75aadcfa92e69e147c7a6f78b333e649dd85ca0e --- wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision dbe26189b20a8577fbf0c7c1919147350530f2b4) +++ wflow-py/make_wflow_exe_cx.py (.../make_wflow_exe_cx.py) (revision 75aadcfa92e69e147c7a6f78b333e649dd85ca0e) @@ -10,6 +10,10 @@ - deltashell - includes bmi/mmi link top deltashell. Windows only. Make sure you have zmq, bmi and mmi installed. bmi and mmi can be downloaded from the openearth github repository """ + +target = 'deltashell' +#target ='normal' + from cx_Freeze import setup, Executable, hooks @@ -66,9 +70,8 @@ os.system("python mkversion.py") -target = 'deltashell' -target ='normal' + data_files=[] scipy_path = os.path.dirname(scipy.__file__) data_files.append(scipy_path) Index: wflow-py/wflow/__init__.py =================================================================== diff -u -r1221929552575774995e54f8057e28b3b3375cbb -r75aadcfa92e69e147c7a6f78b333e649dd85ca0e --- wflow-py/wflow/__init__.py (.../__init__.py) (revision 1221929552575774995e54f8057e28b3b3375cbb) +++ wflow-py/wflow/__init__.py (.../__init__.py) (revision 75aadcfa92e69e147c7a6f78b333e649dd85ca0e) @@ -2,5 +2,5 @@ __version__="1.0.master" __release__="1.0.master.1" __versionnr__="1.0.1" -__build__="2016-11-15 19:46:57.535519" +__build__="2016-11-16 14:37:38.404000" import osgeo.gdal as gdal \ No newline at end of file Index: wflow-py/wflow/wflow_topoflex.py =================================================================== diff -u -rbf5b4322d80fb788bc7792989365f74dc4c046d8 -r75aadcfa92e69e147c7a6f78b333e649dd85ca0e --- wflow-py/wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision bf5b4322d80fb788bc7792989365f74dc4c046d8) +++ wflow-py/wflow/wflow_topoflex.py (.../wflow_topoflex.py) (revision 75aadcfa92e69e147c7a6f78b333e649dd85ca0e) @@ -21,13 +21,13 @@ $Rev: 898 $ """ -import reservoir_Si -import reservoir_Sa -import reservoir_Sw -import reservoir_Su -import reservoir_Sf -import reservoir_Ss -import JarvisCoefficients +import wflow.reservoir_Si as reservoir_Si +import wflow.reservoir_Sa as reservoir_Sa +import wflow.reservoir_Sw as reservoir_Sw +import wflow.reservoir_Su as reservoir_Su +import wflow.reservoir_Sf as reservoir_Sf +import wflow.reservoir_Ss as reservoir_Ss +import wflow.JarvisCoefficients as JarvisCoefficients import numpy import os