Skip to content

Commit 3f15ed4

Browse files
committed
apply isort
1 parent 8e4f80d commit 3f15ed4

21 files changed

+66
-71
lines changed

examples/01_create.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
on a field site.
77
"""
88

9-
import numpy as np
10-
import welltestpy as wtp
119
import anaflow as ana
10+
import numpy as np
1211

12+
import welltestpy as wtp
1313

1414
###############################################################################
1515
# Create the field-site and the campaign

examples/06_triangulate.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"""
1111

1212
import numpy as np
13-
from welltestpy.tools import triangulate, sym, plot_well_pos
13+
14+
from welltestpy.tools import plot_well_pos, sym, triangulate
1415

1516
dist_mat = np.zeros((4, 4), dtype=float)
1617
dist_mat[0, 1] = 3 # distance between well 0 and 1

src/welltestpy/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@
5858
__version__ = "0.0.0.dev0"
5959

6060
from .data.campaignlib import Campaign, FieldSite
61-
from .data.testslib import PumpingTest
6261
from .data.data_io import load_campaign
62+
from .data.testslib import PumpingTest
6363

6464
__all__ = ["__version__"]
6565
__all__ += ["data", "estimate", "process", "tools"]

src/welltestpy/data/__init__.py

+17-21
Original file line numberDiff line numberDiff line change
@@ -80,33 +80,29 @@
8080
load_obs
8181
load_well
8282
"""
83-
from . import varlib, testslib, campaignlib, data_io
84-
83+
from . import campaignlib, data_io, testslib, varlib
84+
from .campaignlib import Campaign, FieldSite
85+
from .data_io import (
86+
load_campaign,
87+
load_fieldsite,
88+
load_obs,
89+
load_test,
90+
load_var,
91+
load_well,
92+
)
93+
from .testslib import PumpingTest
8594
from .varlib import (
86-
Variable,
87-
TimeVar,
88-
HeadVar,
89-
TemporalVar,
9095
CoordinatesVar,
91-
Observation,
92-
StdyObs,
9396
DrawdownObs,
97+
HeadVar,
98+
Observation,
9499
StdyHeadObs,
100+
StdyObs,
101+
TemporalVar,
102+
TimeVar,
103+
Variable,
95104
Well,
96105
)
97-
from .testslib import PumpingTest
98-
from .campaignlib import (
99-
FieldSite,
100-
Campaign,
101-
)
102-
from .data_io import (
103-
load_var,
104-
load_obs,
105-
load_well,
106-
load_campaign,
107-
load_fieldsite,
108-
load_test,
109-
)
110106

111107
__all__ = [
112108
"Variable",

src/welltestpy/data/campaignlib.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from copy import deepcopy as dcopy
1313

1414
from ..tools import plotter
15-
from . import data_io, varlib, testslib
15+
from . import data_io, testslib, varlib
1616

1717
__all__ = ["FieldSite", "Campaign"]
1818

src/welltestpy/data/data_io.py

+7-5
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,19 @@
88
99
.. autosummary::
1010
"""
11-
import os
1211
import csv
12+
import numbers
13+
import os
1314
import shutil
14-
import zipfile
1515
import tempfile
16-
from io import TextIOWrapper as TxtIO, BytesIO as BytIO
17-
import numbers
16+
import zipfile
17+
from io import BytesIO as BytIO
18+
from io import TextIOWrapper as TxtIO
19+
1820
import numpy as np
1921
from packaging.version import parse as version_parse
2022

21-
from . import varlib, campaignlib, testslib
23+
from . import campaignlib, testslib, varlib
2224

2325
try:
2426
from .._version import __version__

src/welltestpy/data/testslib.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
import numpy as np
1616

17-
from ..tools import plotter, diagnostic_plots
18-
from . import varlib, data_io
1917
from ..process import processlib
18+
from ..tools import diagnostic_plots, plotter
19+
from . import data_io, varlib
2020

2121
__all__ = ["Test", "PumpingTest"]
2222

src/welltestpy/data/varlib.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
TimeSeries
2020
Well
2121
"""
22-
from copy import deepcopy as dcopy
2322
import numbers
23+
from copy import deepcopy as dcopy
24+
2425
import numpy as np
2526

2627
from . import data_io
2728

28-
2929
__all__ = [
3030
"Variable",
3131
"TimeVar",

src/welltestpy/estimate/__init__.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,18 @@
4040
SteadyPumping
4141
"""
4242
from . import estimators, spotpylib, steady_lib, transient_lib
43-
4443
from .estimators import (
45-
ExtTheis3D,
4644
ExtTheis2D,
47-
Neuman2004,
48-
Theis,
49-
ExtThiem3D,
45+
ExtTheis3D,
5046
ExtThiem2D,
47+
ExtThiem3D,
48+
Neuman2004,
5149
Neuman2004Steady,
50+
Theis,
5251
Thiem,
5352
)
54-
from .transient_lib import TransientPumping
5553
from .steady_lib import SteadyPumping
54+
from .transient_lib import TransientPumping
5655

5756
__all__ = ["estimators", "spotpylib", "steady_lib", "transient_lib"]
5857
__all__ += [

src/welltestpy/estimate/estimators.py

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
from . import steady_lib, transient_lib
2222

23-
2423
__all__ = [
2524
"ExtTheis3D",
2625
"ExtTheis2D",

src/welltestpy/estimate/spotpylib.py

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import numpy as np
1616
import spotpy
1717

18-
1918
__all__ = ["TypeCurve", "fast_rep"]
2019

2120

src/welltestpy/estimate/steady_lib.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
.. autosummary::
1010
SteadyPumping
1111
"""
12-
from copy import deepcopy as dcopy
1312
import os
1413
import time as timemodule
14+
from copy import deepcopy as dcopy
1515

1616
import numpy as np
1717
import spotpy
1818

1919
from ..data import testslib
2020
from ..process import processlib
21-
from . import spotpylib
2221
from ..tools import plotter
22+
from . import spotpylib
2323

2424
__all__ = [
2525
"SteadyPumping",

src/welltestpy/estimate/transient_lib.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
.. autosummary::
1010
TransientPumping
1111
"""
12-
from copy import deepcopy as dcopy
1312
import os
1413
import time as timemodule
14+
from copy import deepcopy as dcopy
1515

16+
import anaflow as ana
1617
import numpy as np
1718
import spotpy
18-
import anaflow as ana
1919

2020
from ..data import testslib
2121
from ..process import processlib
22-
from . import spotpylib
2322
from ..tools import plotter
23+
from . import spotpylib
2424

2525
__all__ = [
2626
"TransientPumping",

src/welltestpy/process/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
smoothing_derivative
1818
"""
1919
from .processlib import (
20-
normpumptest,
2120
combinepumptest,
22-
filterdrawdown,
2321
cooper_jacob_correction,
22+
filterdrawdown,
23+
normpumptest,
2424
smoothing_derivative,
2525
)
2626

src/welltestpy/process/processlib.py

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
smoothing_derivative
1515
"""
1616
from copy import deepcopy as dcopy
17+
1718
import numpy as np
1819
from scipy import signal
1920

src/welltestpy/tools/__init__.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,20 @@
2727
plotsensitivity
2828
diagnostic_plot_pump_test
2929
"""
30-
from . import plotter, trilib, diagnostic_plots
31-
32-
from .trilib import triangulate, sym
33-
30+
from . import diagnostic_plots, plotter, trilib
31+
from .diagnostic_plots import diagnostic_plot_pump_test
3432
from .plotter import (
3533
campaign_plot,
34+
campaign_well_plot,
3635
fadeline,
3736
plot_well_pos,
38-
campaign_well_plot,
39-
plotfit_transient,
4037
plotfit_steady,
38+
plotfit_transient,
4139
plotparainteract,
4240
plotparatrace,
4341
plotsensitivity,
4442
)
45-
46-
from .diagnostic_plots import diagnostic_plot_pump_test
43+
from .trilib import sym, triangulate
4744

4845
__all__ = [
4946
"triangulate",

src/welltestpy/tools/diagnostic_plots.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@
1212
# pylint: disable=C0103
1313

1414

15+
import matplotlib.pyplot as plt
1516
import numpy as np
1617

1718
from ..process import processlib
1819
from . import plotter
1920

20-
import matplotlib.pyplot as plt
21-
2221

2322
def diagnostic_plot_pump_test(
2423
observation,

src/welltestpy/tools/plotter.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@
2020
"""
2121
# pylint: disable=C0103
2222
import copy
23-
import warnings
2423
import functools as ft
24+
import warnings
2525

26-
import numpy as np
27-
from scipy.stats import gaussian_kde
28-
29-
from mpl_toolkits.mplot3d import Axes3D
3026
import matplotlib.pyplot as plt
3127
import matplotlib.ticker as ticker
28+
import numpy as np
29+
from mpl_toolkits.mplot3d import Axes3D
30+
from scipy.stats import gaussian_kde
3231

3332

3433
def _get_fig_ax(

src/welltestpy/tools/trilib.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"""
1313
# pylint: disable=C0103
1414
from copy import deepcopy as dcopy
15-
import numpy as np
1615

16+
import numpy as np
1717

1818
__all__ = ["triangulate", "sym"]
1919

tests/test_process.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
"""
33
This is the unittest of welltestpy.process.
44
"""
5+
import copy
56
import unittest
7+
68
import numpy as np
7-
import copy
9+
810
import welltestpy as wtp
911

1012

tests/test_welltestpy.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
"""
55

66
import unittest
7-
import numpy as np
7+
88
import matplotlib as mpl
9+
import numpy as np
910

1011
mpl.use("Agg")
1112

12-
import welltestpy as wtp
13-
from welltestpy.tools import triangulate, sym, plot_well_pos
14-
1513
import anaflow as ana
1614

15+
import welltestpy as wtp
16+
from welltestpy.tools import plot_well_pos, sym, triangulate
17+
1718

1819
class TestWTP(unittest.TestCase):
1920
def setUp(self):

0 commit comments

Comments
 (0)