From 2b02b6a5dbc1f8c3746ee37f26cce3c3ec0c939c Mon Sep 17 00:00:00 2001 From: dave <dave@dtu.dk> Date: Wed, 16 Dec 2015 12:56:21 +0100 Subject: [PATCH] use the correct import statement for prepost submodule --- wetb/prepost/dlcdefs.py | 2 +- wetb/prepost/dlcplots.py | 6 +++--- wetb/prepost/dlctemplate.py | 8 +++----- wetb/prepost/filters.py | 6 +++--- wetb/prepost/h2_vs_hs2.py | 8 ++++---- wetb/prepost/hawcstab2.py | 2 +- wetb/prepost/windIO.py | 2 +- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/wetb/prepost/dlcdefs.py b/wetb/prepost/dlcdefs.py index aea6749..8627cb1 100644 --- a/wetb/prepost/dlcdefs.py +++ b/wetb/prepost/dlcdefs.py @@ -12,7 +12,7 @@ import unittest import pandas as pd -from wetb import misc +from wetb.prepost import misc def casedict2xlsx(): """ diff --git a/wetb/prepost/dlcplots.py b/wetb/prepost/dlcplots.py index 093b45b..880d5ae 100644 --- a/wetb/prepost/dlcplots.py +++ b/wetb/prepost/dlcplots.py @@ -31,9 +31,9 @@ import pandas as pd #import numpy as np #import windIO -from wetb import mplutils -from wetb import Simulations as sim -from wetb import dlcdefs +from wetb.prepost import mplutils +from wetb.prepost import Simulations as sim +from wetb.prepost import dlcdefs plt.rc('font', family='serif') plt.rc('xtick', labelsize=10) diff --git a/wetb/prepost/dlctemplate.py b/wetb/prepost/dlctemplate.py index 6f71625..47d795b 100755 --- a/wetb/prepost/dlctemplate.py +++ b/wetb/prepost/dlctemplate.py @@ -16,11 +16,9 @@ from argparse import ArgumentParser from matplotlib import pyplot as plt #import matplotlib as mpl -from wetb import Simulations as sim -#import misc -#import windIO -from wetb import dlcdefs -from wetb import dlcplots +from wetb.prepost import Simulations as sim +from wetb.prepost import dlcdefs +from wetb.prepost import dlcplots plt.rc('font', family='serif') plt.rc('xtick', labelsize=10) diff --git a/wetb/prepost/filters.py b/wetb/prepost/filters.py index acd89c3..760ffe2 100644 --- a/wetb/prepost/filters.py +++ b/wetb/prepost/filters.py @@ -11,9 +11,9 @@ Created on Sun Jan 20 18:14:02 2013 import numpy as np import scipy as sp -from wetb import DataChecks as chk -from wetb.misc import calc_sample_rate -from wetb import mplutils +from wetb.prepost import DataChecks as chk +from wetb.prepost.misc import calc_sample_rate +from wetb.prepost import mplutils class Filters: diff --git a/wetb/prepost/h2_vs_hs2.py b/wetb/prepost/h2_vs_hs2.py index bafddcc..8bbce7b 100644 --- a/wetb/prepost/h2_vs_hs2.py +++ b/wetb/prepost/h2_vs_hs2.py @@ -15,10 +15,10 @@ import numpy as np import pandas as pd from matplotlib import pyplot as plt -from wetb import Simulations as sim -from wetb import dlcdefs -from wetb import hawcstab2 as hs2 -from wetb import mplutils +from wetb.prepost import Simulations as sim +from wetb.prepost import dlcdefs +from wetb.prepost import hawcstab2 as hs2 +from wetb.prepost import mplutils class Configurations: diff --git a/wetb/prepost/hawcstab2.py b/wetb/prepost/hawcstab2.py index 1068541..516be89 100644 --- a/wetb/prepost/hawcstab2.py +++ b/wetb/prepost/hawcstab2.py @@ -14,7 +14,7 @@ import re import numpy as np import pandas as pd -from wetb import mplutils +from wetb.prepost import mplutils class dummy: diff --git a/wetb/prepost/windIO.py b/wetb/prepost/windIO.py index 9477962..c58d41b 100755 --- a/wetb/prepost/windIO.py +++ b/wetb/prepost/windIO.py @@ -32,7 +32,7 @@ import pandas as pd # misc is part of prepost, which is available on the dtu wind gitlab server: # https://gitlab.windenergy.dtu.dk/dave/prepost -from wetb import misc +from wetb.prepost import misc # wind energy python toolbox, available on the dtu wind redmine server: # http://vind-redmine.win.dtu.dk/projects/pythontoolbox/repository/show/fatigue_tools import fatigue -- GitLab