From 17fc336ec09d3adccd797e3b59c3d9407a917612 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Fri, 28 Jan 2022 23:48:10 +1300 Subject: [PATCH] style(imports): use isort tool, remove unused imports --- autotest/ci_framework.py | 3 +- autotest/ci_prepare.py | 10 +-- autotest/run_notebooks.py | 2 +- autotest/run_scripts.py | 8 +- autotest/t003_test.py | 4 +- autotest/t004_test_utilarray.py | 13 ++-- autotest/t005_test.py | 8 +- autotest/t006_test.py | 3 +- autotest/t007_test.py | 24 +++--- autotest/t008_test.py | 7 +- autotest/t009_test.py | 14 ++-- autotest/t010_test.py | 3 +- autotest/t011_test.py | 6 +- autotest/t012_test.py | 1 + autotest/t013_test.py | 1 + autotest/t014_test.py | 5 +- autotest/t015_test.py | 2 +- autotest/t016_test.py | 6 +- autotest/t017_test.py | 6 +- autotest/t018_test.py | 4 +- autotest/t019_test.py | 4 +- autotest/t020_test.py | 14 ++-- autotest/t021_test.py | 4 +- autotest/t022_test.py | 1 + autotest/t023_test.py | 4 +- autotest/t024_test.py | 6 +- autotest/t025_test.py | 8 +- autotest/t026_test.py | 4 +- autotest/t027_test.py | 11 ++- autotest/t028_test.py | 7 +- autotest/t029_test.py | 7 +- autotest/t030_test.py | 4 +- autotest/t031_test.py | 14 ++-- autotest/t032_test.py | 12 +-- autotest/t033_test.py | 4 +- autotest/t034_test.py | 10 ++- autotest/t035_test.py | 8 +- autotest/t036_test.py | 6 +- autotest/t037_test.py | 8 +- autotest/t038_test.py | 6 +- autotest/t039_test.py | 8 +- autotest/t040_test.py | 8 +- autotest/t041_test.py | 6 +- autotest/t042_test.py | 3 +- autotest/t043_test.py | 8 +- autotest/t044_test.py | 8 +- autotest/t045_test.py | 8 +- autotest/t046_test.py | 8 +- autotest/t047_test.py | 4 +- autotest/t048_test.py | 4 +- autotest/t049_test.py | 6 +- autotest/t050_test.py | 8 +- autotest/t051_test.py | 4 +- autotest/t052_test.py | 6 +- autotest/t053_test.py | 2 + autotest/t054_test_mfnwt.py | 6 +- autotest/t055_test_mt3d_list.py | 1 + autotest/t056_test_pcg_fmt.py | 1 + autotest/t057_test_mp7.py | 4 +- autotest/t058_test_mp7.py | 5 +- autotest/t059_test_mp7.py | 4 +- autotest/t060_test_lkt.py | 4 +- autotest/t061_test_gridgen.py | 4 +- autotest/t062_test_intersect.py | 6 +- autotest/t063_test_lgrutil.py | 2 +- autotest/t064_test_performance.py | 8 +- autotest/t065_test_gridintersect.py | 14 ++-- autotest/t066_test_copy.py | 10 ++- autotest/t067_test_ulstrd.py | 4 +- autotest/t068_test_ssm.py | 6 +- autotest/t069_test_vtkexportmodel.py | 6 +- autotest/t070_test_quasi3layers.py | 6 +- autotest/t071_test_nwt_ag.py | 6 +- autotest/t072_test_spedis.py | 9 ++- autotest/t073_test_cvfd.py | 3 +- autotest/t074_test_geospatial_util.py | 24 +++--- autotest/t075_test_ugrid.py | 4 +- autotest/t076_test_modelgrid_thick.py | 3 +- autotest/t078_test_lake_connections.py | 4 +- autotest/t079_test_cbc_full3D.py | 6 +- autotest/t080_test.py | 4 +- autotest/t501_test.py | 8 +- autotest/t502_test.py | 19 +++-- autotest/t503_test.py | 13 ++-- autotest/t504_test.py | 7 +- autotest/t505_test.py | 12 +-- autotest/t506_test.py | 5 +- autotest/t550_test.py | 9 ++- etc/environment.yml | 1 + etc/requirements.full.pip.txt | 1 + etc/requirements.pip.txt | 1 + etc/requirements.windows.pip.txt | 1 + examples/Testing/flopy3_2L_CS.py | 7 +- .../Testing/flopy3_CrossSectionExample.py | 6 +- examples/Testing/flopy3_Oahu_02_02b.py | 1 + examples/Testing/flopy3_loadSECP.py | 5 +- examples/Testing/flopy3_loadSUB.py | 2 +- examples/Testing/flopy3_loadSWT.py | 2 +- examples/Testing/flopy3_load_parameters.py | 4 +- examples/Testing/flopy3_loadplotfreyberg.py | 1 + examples/Testing/flopy3_plotdata.py | 2 - examples/Testing/testunitcbc.py | 4 + examples/Testing/util_list_tester.py | 5 +- examples/common/setup_pmv_demo.py | 6 +- .../groundwater_paper/scripts/uspb_capture.py | 1 + .../scripts/uspb_capture_par.py | 8 +- examples/scripts/flopy_henry.py | 4 +- examples/scripts/flopy_lake_example.py | 3 +- examples/scripts/flopy_swi2_ex1.py | 5 +- examples/scripts/flopy_swi2_ex2.py | 3 +- examples/scripts/flopy_swi2_ex3.py | 3 +- examples/scripts/flopy_swi2_ex4.py | 3 +- examples/scripts/flopy_swi2_ex5.py | 5 +- flopy/__init__.py | 31 ++++---- flopy/discretization/__init__.py | 2 +- flopy/discretization/grid.py | 7 +- flopy/discretization/structuredgrid.py | 5 +- flopy/discretization/unstructuredgrid.py | 6 +- flopy/discretization/vertexgrid.py | 6 +- flopy/export/__init__.py | 8 +- flopy/export/metadata.py | 2 +- flopy/export/netcdf.py | 13 ++-- flopy/export/shapefile_utils.py | 8 +- flopy/export/utils.py | 18 ++--- flopy/export/vtk.py | 6 +- flopy/mbase.py | 13 ++-- flopy/mf6/__init__.py | 12 +-- flopy/mf6/coordinates/__init__.py | 1 - flopy/mf6/coordinates/modeldimensions.py | 9 ++- flopy/mf6/coordinates/modelgrid.py | 3 +- flopy/mf6/data/__init__.py | 5 +- flopy/mf6/data/mfdata.py | 17 +++-- flopy/mf6/data/mfdataarray.py | 16 ++-- flopy/mf6/data/mfdatalist.py | 18 +++-- flopy/mf6/data/mfdatascalar.py | 13 ++-- flopy/mf6/data/mfdatastorage.py | 26 +++---- flopy/mf6/data/mfdatautil.py | 17 +++-- flopy/mf6/data/mffileaccess.py | 20 +++-- flopy/mf6/data/mfstructure.py | 6 +- flopy/mf6/mfbase.py | 9 ++- flopy/mf6/mfmodel.py | 34 +++++---- flopy/mf6/mfpackage.py | 39 +++++----- flopy/mf6/modflow/__init__.py | 75 +++++++++---------- flopy/mf6/modflow/mfgwf.py | 2 +- flopy/mf6/modflow/mfgwfcsub.py | 2 +- flopy/mf6/modflow/mfgwfevta.py | 2 +- flopy/mf6/modflow/mfgwfnpf.py | 2 +- flopy/mf6/modflow/mfgwfrcha.py | 2 +- flopy/mf6/modflow/mfgwfsto.py | 2 +- flopy/mf6/modflow/mfgwt.py | 2 +- flopy/mf6/modflow/mfgwtist.py | 2 +- flopy/mf6/modflow/mfsimulation.py | 23 +++--- flopy/mf6/modflow/mfutlspca.py | 2 +- flopy/mf6/modflow/mfutltas.py | 2 +- flopy/mf6/utils/__init__.py | 5 +- flopy/mf6/utils/binaryfile_utils.py | 2 + flopy/mf6/utils/binarygrid_util.py | 5 +- flopy/mf6/utils/createpackages.py | 29 ++++--- flopy/mf6/utils/generate_classes.py | 5 +- flopy/mf6/utils/mfobservation.py | 3 +- flopy/mf6/utils/output_util.py | 11 +-- flopy/mf6/utils/postprocessing.py | 1 + flopy/mfusg/__init__.py | 10 +-- flopy/mfusg/mfusg.py | 5 +- flopy/mfusg/mfusgbcf.py | 6 +- flopy/mfusg/mfusgcln.py | 4 +- flopy/mfusg/mfusgdisu.py | 4 +- flopy/mfusg/mfusggnc.py | 8 +- flopy/mfusg/mfusglpf.py | 8 +- flopy/mfusg/mfusgwel.py | 7 +- flopy/modflow/__init__.py | 60 +++++++-------- flopy/modflow/mf.py | 11 +-- flopy/modflow/mfaddoutsidefile.py | 1 - flopy/modflow/mfag.py | 6 +- flopy/modflow/mfbas.py | 2 + flopy/modflow/mfbct.py | 1 + flopy/modflow/mfchd.py | 1 + flopy/modflow/mfdis.py | 2 +- flopy/modflow/mfdrn.py | 3 +- flopy/modflow/mfdrt.py | 3 +- flopy/modflow/mfevt.py | 6 +- flopy/modflow/mffhb.py | 2 +- flopy/modflow/mfflwob.py | 2 + flopy/modflow/mfghb.py | 1 + flopy/modflow/mfhfb.py | 5 +- flopy/modflow/mfhob.py | 1 + flopy/modflow/mflak.py | 3 +- flopy/modflow/mflpf.py | 2 +- flopy/modflow/mfmnw1.py | 4 +- flopy/modflow/mfmnw2.py | 9 +-- flopy/modflow/mfmnwi.py | 2 +- flopy/modflow/mfpar.py | 5 +- flopy/modflow/mfparbc.py | 1 + flopy/modflow/mfrch.py | 5 +- flopy/modflow/mfriv.py | 1 + flopy/modflow/mfsfr2.py | 19 ++--- flopy/modflow/mfstr.py | 6 +- flopy/modflow/mfupw.py | 3 +- flopy/modflow/mfuzf1.py | 8 +- flopy/modflow/mfwel.py | 6 +- flopy/modflow/mfzon.py | 1 + flopy/modflowlgr/__init__.py | 2 +- flopy/modpath/__init__.py | 16 ++-- flopy/modpath/mp6.py | 4 +- flopy/modpath/mp6bas.py | 1 + flopy/modpath/mp6sim.py | 1 + flopy/modpath/mp7.py | 9 ++- flopy/modpath/mp7bas.py | 1 + flopy/modpath/mp7particledata.py | 3 +- flopy/modpath/mp7particlegroup.py | 4 +- flopy/modpath/mp7sim.py | 2 + flopy/mt3d/__init__.py | 4 +- flopy/mt3d/mt.py | 18 +++-- flopy/mt3d/mtbtn.py | 4 +- flopy/mt3d/mtdsp.py | 1 + flopy/mt3d/mtlkt.py | 2 +- flopy/mt3d/mtrct.py | 1 + flopy/mt3d/mtsft.py | 2 +- flopy/mt3d/mtssm.py | 6 +- flopy/mt3d/mtuzt.py | 2 +- flopy/pakbase.py | 5 +- flopy/pest/tplarray.py | 3 +- flopy/plot/__init__.py | 6 +- flopy/plot/crosssection.py | 14 ++-- flopy/plot/map.py | 13 ++-- flopy/plot/plotutil.py | 19 ++--- flopy/plot/styles.py | 1 + flopy/seawat/swt.py | 7 +- flopy/seawat/swtvdf.py | 3 +- flopy/seawat/swtvsc.py | 3 +- flopy/utils/__init__.py | 57 +++++++------- flopy/utils/binaryfile.py | 5 +- flopy/utils/check.py | 2 + flopy/utils/datafile.py | 4 +- flopy/utils/datautil.py | 3 +- flopy/utils/flopy_io.py | 6 +- flopy/utils/formattedfile.py | 1 + flopy/utils/geospatial_utils.py | 2 +- flopy/utils/gridgen.py | 14 ++-- flopy/utils/gridintersect.py | 4 +- flopy/utils/lgrutil.py | 1 + flopy/utils/mflistfile.py | 7 +- flopy/utils/modpathfile.py | 10 +-- flopy/utils/mtlistfile.py | 1 + flopy/utils/observationfile.py | 8 +- flopy/utils/optionblock.py | 1 + flopy/utils/parse_version.py | 8 +- flopy/utils/postprocessing.py | 1 - flopy/utils/rasters.py | 5 +- flopy/utils/sfroutputfile.py | 1 + flopy/utils/triangle.py | 8 +- flopy/utils/util_array.py | 8 +- flopy/utils/util_list.py | 4 +- flopy/utils/utils_def.py | 1 + flopy/utils/voronoi.py | 2 +- flopy/utils/zonbud.py | 8 +- pyproject.toml | 5 ++ release/make-release.py | 6 +- release/run_notebooks.py | 1 - release/update-version_changes.py | 2 +- 260 files changed, 978 insertions(+), 822 deletions(-) diff --git a/autotest/ci_framework.py b/autotest/ci_framework.py index da78173fc8..c8e2ef4747 100644 --- a/autotest/ci_framework.py +++ b/autotest/ci_framework.py @@ -1,6 +1,7 @@ import os -import sys import shutil +import sys + import pymake # command line arguments to: diff --git a/autotest/ci_prepare.py b/autotest/ci_prepare.py index 9847e9e98a..2a1cc7ab62 100644 --- a/autotest/ci_prepare.py +++ b/autotest/ci_prepare.py @@ -2,18 +2,14 @@ Script to be used to download any required data prior to autotests """ import os -import sys import shutil import subprocess +import sys import pymake -import flopy +from ci_framework import download_mf6_examples, get_parent_path -from ci_framework import ( - get_parent_path, - create_test_dir, - download_mf6_examples, -) +import flopy # os.environ["CI"] = "1" diff --git a/autotest/run_notebooks.py b/autotest/run_notebooks.py index b85fe3e120..f09ba61199 100644 --- a/autotest/run_notebooks.py +++ b/autotest/run_notebooks.py @@ -1,7 +1,7 @@ # Remove the temp directory and then create a fresh one import os -import pytest +import pytest nbdir = os.path.join("..", "examples", "Notebooks") dpth = nbdir diff --git a/autotest/run_scripts.py b/autotest/run_scripts.py index 8d65839856..42658ebe6f 100644 --- a/autotest/run_scripts.py +++ b/autotest/run_scripts.py @@ -1,11 +1,11 @@ # Remove the temp directory and then create a fresh one -import pytest import os -import sys import shutil -from subprocess import Popen, PIPE +import sys +from subprocess import PIPE, Popen -from ci_framework import get_parent_path, FlopyTestSetup +import pytest +from ci_framework import FlopyTestSetup, get_parent_path parent_path = get_parent_path() base_dir = os.path.join(parent_path, "temp") diff --git a/autotest/t003_test.py b/autotest/t003_test.py index 85fc7076c8..c5272ca760 100644 --- a/autotest/t003_test.py +++ b/autotest/t003_test.py @@ -1,6 +1,8 @@ +import os + import pytest + import flopy -import os def test_loadfreyberg(): diff --git a/autotest/t004_test_utilarray.py b/autotest/t004_test_utilarray.py index 0ad0344144..bac1fdf408 100644 --- a/autotest/t004_test_utilarray.py +++ b/autotest/t004_test_utilarray.py @@ -1,14 +1,15 @@ import os -import numpy as np -import flopy import warnings from io import StringIO from struct import pack from tempfile import TemporaryFile from textwrap import dedent -from flopy.utils.util_array import Util2d, Util3d, Transient2d, Transient3d -from ci_framework import base_test_dir, FlopyTestSetup +import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy +from flopy.utils.util_array import Transient2d, Transient3d, Util2d, Util3d base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) @@ -802,9 +803,6 @@ def test_mflist(): def test_how(): - import numpy as np - import flopy - model_ws = f"{base_dir}_test_how" test_setup = FlopyTestSetup(test_dirs=model_ws) @@ -835,7 +833,6 @@ def test_mflist_fromfile(): the .array attribute will load the file """ import pandas as pd - import flopy model_ws = f"{base_dir}_test_mflist_fromfile" test_setup = FlopyTestSetup(test_dirs=model_ws) diff --git a/autotest/t005_test.py b/autotest/t005_test.py index 9c6da8c349..6e8cea2482 100644 --- a/autotest/t005_test.py +++ b/autotest/t005_test.py @@ -1,15 +1,15 @@ # Test instantiation of flopy classes import os -from ci_framework import base_test_dir, FlopyTestSetup +import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy cpth = base_test_dir(__file__, rel_path="temp", verbose=True) def test_modflow_unstructured(): - import flopy - import numpy as np - test_setup = FlopyTestSetup(test_dirs=cpth) mf = flopy.mfusg.MfUsg(structured=False, model_ws=cpth) diff --git a/autotest/t006_test.py b/autotest/t006_test.py index 7c0dde9691..5eabe28f44 100644 --- a/autotest/t006_test.py +++ b/autotest/t006_test.py @@ -1,5 +1,6 @@ # Test reference class import os + import numpy as np try: @@ -17,7 +18,7 @@ except ImportError: shapefile = None -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir cpth = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t007_test.py b/autotest/t007_test.py index 742fa62f16..edcd02f853 100644 --- a/autotest/t007_test.py +++ b/autotest/t007_test.py @@ -1,15 +1,13 @@ # Test export module -import sys -import pytest - -sys.path.append("..") import glob import os import shutil + import numpy as np -import flopy +import pytest +from ci_framework import FlopyTestSetup, base_test_dir -from ci_framework import base_test_dir, FlopyTestSetup +import flopy base_dir = base_test_dir( __file__, @@ -336,8 +334,7 @@ def test_write_shapefile(): return from flopy.discretization import StructuredGrid - from flopy.export.shapefile_utils import shp2recarray - from flopy.export.shapefile_utils import write_grid_shapefile + from flopy.export.shapefile_utils import shp2recarray, write_grid_shapefile ws_out = f"{base_dir}_shapefile_write" test_setup = FlopyTestSetup(verbose=True, test_dirs=ws_out) @@ -1166,8 +1163,8 @@ def check_vertices(): def test_mapview_plot_bc(): - from matplotlib.collections import QuadMesh, PathCollection import matplotlib.pyplot as plt + from matplotlib.collections import PathCollection, QuadMesh sim_name = "mfsim.nam" sim_path = os.path.join( @@ -1251,8 +1248,8 @@ def test_mapview_plot_bc(): def test_crosssection_plot_bc(): - from matplotlib.collections import PatchCollection import matplotlib.pyplot as plt + from matplotlib.collections import PatchCollection sim_name = "mfsim.nam" sim_path = os.path.join( @@ -1330,11 +1327,11 @@ def test_crosssection_plot_bc(): def test_tricontour_NaN(): - from flopy.plot import PlotMapView - import numpy as np - from flopy.discretization import StructuredGrid import matplotlib.pyplot as plt + from flopy.discretization import StructuredGrid + from flopy.plot import PlotMapView + arr = np.random.rand(10, 10) * 100 arr[-1, :] = np.nan delc = np.array([10] * 10, dtype=float) @@ -1741,6 +1738,7 @@ def test_export_contourf(): if import_shapefile() is None: return import matplotlib.pyplot as plt + from flopy.export.utils import export_contourf ws_out = f"{base_dir}_shapefile_export_contourf" diff --git a/autotest/t008_test.py b/autotest/t008_test.py index 5f165301e0..049ee07210 100644 --- a/autotest/t008_test.py +++ b/autotest/t008_test.py @@ -3,11 +3,12 @@ These are the examples that are distributed with MODFLOW-2005. """ -import pytest import os -import flopy -from ci_framework import base_test_dir, FlopyTestSetup +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy pth = os.path.join("..", "examples", "data", "mf2005_test") namfiles = [namfile for namfile in os.listdir(pth) if namfile.endswith(".nam")] diff --git a/autotest/t009_test.py b/autotest/t009_test.py index 19dd6e8900..9087eec470 100644 --- a/autotest/t009_test.py +++ b/autotest/t009_test.py @@ -1,15 +1,17 @@ __author__ = "aleaf" -import sys - -import os import glob -import shutil import io -import numpy as np +import os +import shutil + import matplotlib import matplotlib.pyplot as plt +import numpy as np + +from flopy.discretization import StructuredGrid from flopy.utils.recarray_utils import create_empty_recarray +from flopy.utils.sfroutputfile import SfrFile try: import shapefile @@ -22,8 +24,6 @@ import flopy fm = flopy.modflow -from flopy.utils.sfroutputfile import SfrFile -from flopy.discretization import StructuredGrid path = os.path.join("..", "examples", "data", "mf2005_test") path2 = os.path.join("..", "examples", "data", "sfr_test") diff --git a/autotest/t010_test.py b/autotest/t010_test.py index a13f02cfd1..1d7197c8c5 100644 --- a/autotest/t010_test.py +++ b/autotest/t010_test.py @@ -3,9 +3,10 @@ need to add a test case that has elevation input by reach """ +import os + import pytest -import os import flopy from flopy.modflow.mfsfr2 import check diff --git a/autotest/t011_test.py b/autotest/t011_test.py index 3d02a9d3da..ab334d76ac 100644 --- a/autotest/t011_test.py +++ b/autotest/t011_test.py @@ -2,10 +2,12 @@ Some basic tests for mflistfile.py module (not super rigorous) """ -import pytest import os -import flopy + import numpy as np +import pytest + +import flopy def test_mflistfile(): diff --git a/autotest/t012_test.py b/autotest/t012_test.py index 01a09beb43..35d25a4eee 100644 --- a/autotest/t012_test.py +++ b/autotest/t012_test.py @@ -1,6 +1,7 @@ # Test loading of MODFLOW and MT3D models that come with MT3D distribution import os import sys + import flopy pthtest = os.path.join("..", "examples", "data", "mt3d_test") diff --git a/autotest/t013_test.py b/autotest/t013_test.py index 5c957d35f9..8d2483bd78 100644 --- a/autotest/t013_test.py +++ b/autotest/t013_test.py @@ -4,6 +4,7 @@ import os import warnings + import flopy diff --git a/autotest/t014_test.py b/autotest/t014_test.py index 3e5dd2556c..2744cb3930 100644 --- a/autotest/t014_test.py +++ b/autotest/t014_test.py @@ -2,11 +2,12 @@ Some basic tests for STR load. """ +import os + +import numpy as np import pytest -import os import flopy -import numpy as np path = os.path.join("..", "examples", "data", "mf2005_test") pthgw = os.path.join("..", "examples", "groundwater_paper", "uspb", "flopy") diff --git a/autotest/t015_test.py b/autotest/t015_test.py index 1d50b0a3c2..af0e940102 100644 --- a/autotest/t015_test.py +++ b/autotest/t015_test.py @@ -14,7 +14,7 @@ except: pymake = None -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t016_test.py b/autotest/t016_test.py index bc4441e631..9bab6eb602 100644 --- a/autotest/t016_test.py +++ b/autotest/t016_test.py @@ -1,7 +1,9 @@ import os -import flopy + import numpy as np -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t017_test.py b/autotest/t017_test.py index eb682a3c8f..07d2ac0019 100644 --- a/autotest/t017_test.py +++ b/autotest/t017_test.py @@ -1,9 +1,11 @@ # Test binary and formatted data readers -import pytest import os + import numpy as np +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t018_test.py b/autotest/t018_test.py index 7e734c270e..877fbd8325 100644 --- a/autotest/t018_test.py +++ b/autotest/t018_test.py @@ -1,7 +1,9 @@ import os + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t019_test.py b/autotest/t019_test.py index 980a67fd2a..e985eec86c 100644 --- a/autotest/t019_test.py +++ b/autotest/t019_test.py @@ -1,7 +1,9 @@ import os + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t020_test.py b/autotest/t020_test.py index 18cd6e2940..36bff6bf91 100644 --- a/autotest/t020_test.py +++ b/autotest/t020_test.py @@ -1,7 +1,11 @@ # Test modflow write and run -import numpy as np +import os + import matplotlib.pyplot as plt -from ci_framework import base_test_dir, FlopyTestSetup +import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) @@ -20,9 +24,6 @@ def analyticalWaterTableSolution(h1, h2, z, R, K, L, x): def test_mfnwt_run(): - import os - import flopy - exe_name = "mfnwt" exe = flopy.which(exe_name) @@ -165,9 +166,6 @@ def test_mfnwt_run(): def test_irch(): - import os - import flopy - model_ws = f"{base_dir}_test_tpl_constant" test_setup = FlopyTestSetup(verbose=True, test_dirs=model_ws) diff --git a/autotest/t021_test.py b/autotest/t021_test.py index 27e2d1c667..a5a3b4132d 100644 --- a/autotest/t021_test.py +++ b/autotest/t021_test.py @@ -1,7 +1,9 @@ import os + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t022_test.py b/autotest/t022_test.py index 7436a186d8..f63ea86b11 100644 --- a/autotest/t022_test.py +++ b/autotest/t022_test.py @@ -1,5 +1,6 @@ # Test SWR binary read functionality import os + import flopy pth = os.path.join("..", "examples", "data", "swr_test") diff --git a/autotest/t023_test.py b/autotest/t023_test.py index fe19417694..663a79743e 100644 --- a/autotest/t023_test.py +++ b/autotest/t023_test.py @@ -1,8 +1,8 @@ # Test multi-species options in mt3d -import os import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t024_test.py b/autotest/t024_test.py index 493cd8ece7..f7111649d2 100644 --- a/autotest/t024_test.py +++ b/autotest/t024_test.py @@ -1,8 +1,10 @@ -import pytest import os + import numpy as np +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t025_test.py b/autotest/t025_test.py index 6048d30fdb..d074c20040 100644 --- a/autotest/t025_test.py +++ b/autotest/t025_test.py @@ -2,11 +2,13 @@ Some basic tests for LAKE load. """ -import pytest import os -import flopy + import pymake -from ci_framework import base_test_dir, FlopyTestSetup +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t026_test.py b/autotest/t026_test.py index 05041ecac6..b29b0aecb7 100644 --- a/autotest/t026_test.py +++ b/autotest/t026_test.py @@ -3,10 +3,10 @@ """ -import os import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t027_test.py b/autotest/t027_test.py index b59188b03a..7120fc6b26 100644 --- a/autotest/t027_test.py +++ b/autotest/t027_test.py @@ -1,15 +1,14 @@ """ test MNW1 and MNW2 packages """ -import sys - -sys.path.insert(0, "..") -import shutil import os -import flopy +import shutil + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy from flopy.utils.flopy_io import line_parse -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t028_test.py b/autotest/t028_test.py index 44f6a10d43..bc10808a4a 100644 --- a/autotest/t028_test.py +++ b/autotest/t028_test.py @@ -1,8 +1,9 @@ -import pytest import os -import shutil + +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t029_test.py b/autotest/t029_test.py index 1e65c23236..0c69007d13 100644 --- a/autotest/t029_test.py +++ b/autotest/t029_test.py @@ -1,14 +1,13 @@ -import pytest import os -import numpy as np import matplotlib import matplotlib.pyplot as plt +import numpy as np +import pytest +from ci_framework import FlopyTestSetup, base_test_dir import flopy -from ci_framework import base_test_dir, FlopyTestSetup - base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) pthtest = os.path.join("..", "examples", "data", "mfgrd_test") diff --git a/autotest/t030_test.py b/autotest/t030_test.py index 98058ca072..df6264f974 100644 --- a/autotest/t030_test.py +++ b/autotest/t030_test.py @@ -1,6 +1,6 @@ -import os +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t031_test.py b/autotest/t031_test.py index f3f99d2454..ed49985115 100644 --- a/autotest/t031_test.py +++ b/autotest/t031_test.py @@ -1,19 +1,17 @@ """ test modpath functionality """ -import sys - -sys.path.insert(0, "..") -import glob -import shutil import os -import flopy +import shutil + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy from flopy.discretization import StructuredGrid +from flopy.modpath.mp6sim import StartingLocationsFile from flopy.utils.modpathfile import EndpointFile, PathlineFile from flopy.utils.recarray_utils import ra_slice -from flopy.modpath.mp6sim import StartingLocationsFile -from ci_framework import base_test_dir, FlopyTestSetup try: import shapefile diff --git a/autotest/t032_test.py b/autotest/t032_test.py index e9ed23eba4..f4f6a18647 100644 --- a/autotest/t032_test.py +++ b/autotest/t032_test.py @@ -3,17 +3,19 @@ """ import os import shutil + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from flopy.utils.geometry import Polygon +from flopy.export.netcdf import NetCdf from flopy.export.shapefile_utils import ( + CRS, + EpsgReference, recarray2shp, shp2recarray, - EpsgReference, - CRS, ) -from flopy.export.netcdf import NetCdf -from ci_framework import base_test_dir, FlopyTestSetup +from flopy.utils.geometry import Polygon base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t033_test.py b/autotest/t033_test.py index 6d2e74c8a9..9676fd35a4 100644 --- a/autotest/t033_test.py +++ b/autotest/t033_test.py @@ -1,8 +1,8 @@ -import os import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy from flopy.utils.util_array import Util2d -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t034_test.py b/autotest/t034_test.py index 47695e0e47..2b30612263 100644 --- a/autotest/t034_test.py +++ b/autotest/t034_test.py @@ -1,13 +1,15 @@ """ test UZF package """ +import glob import os import shutil -import glob + +import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy from flopy.utils.util_array import Util2d -import numpy as np -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) @@ -273,7 +275,7 @@ def test_uzf_surfk(): def test_read_write_nwt_options(): from io import StringIO - from flopy.modflow import ModflowWel, ModflowUzf1, ModflowSfr2 + from flopy.modflow import ModflowSfr2, ModflowUzf1, ModflowWel from flopy.utils.optionblock import OptionBlock model_ws = f"{base_dir}_test_read_write_nwt_options" diff --git a/autotest/t035_test.py b/autotest/t035_test.py index a2bbd48ac9..fb05c1e97e 100644 --- a/autotest/t035_test.py +++ b/autotest/t035_test.py @@ -2,12 +2,14 @@ Test the lgr model """ import os -import sys import shutil +import sys + import numpy as np -import flopy import pymake -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t036_test.py b/autotest/t036_test.py index d09b891c3b..bbb7cb2ea2 100644 --- a/autotest/t036_test.py +++ b/autotest/t036_test.py @@ -2,9 +2,11 @@ Test loading and preserving existing unit numbers """ import os -import flopy + import pymake -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t037_test.py b/autotest/t037_test.py index 1f0c6c1698..62298e6242 100644 --- a/autotest/t037_test.py +++ b/autotest/t037_test.py @@ -2,11 +2,13 @@ Some basic tests for SWR2 load. """ -import pytest import os -import flopy + import pymake -from ci_framework import base_test_dir, FlopyTestSetup +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t038_test.py b/autotest/t038_test.py index ed347a6193..59c5d0da08 100644 --- a/autotest/t038_test.py +++ b/autotest/t038_test.py @@ -3,10 +3,12 @@ These are the examples that are distributed with MODFLOW-USG. """ -import pytest import os + +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t039_test.py b/autotest/t039_test.py index d5477a2654..844c56b35d 100644 --- a/autotest/t039_test.py +++ b/autotest/t039_test.py @@ -2,13 +2,11 @@ Test zonbud utility """ import os + import numpy as np + import flopy -from flopy.utils import ( - ZoneBudget, - ZoneBudget6, - ZoneFile6, -) +from flopy.utils import ZoneBudget, ZoneBudget6, ZoneFile6 loadpth = os.path.join("..", "examples", "data", "zonbud_examples") outpth = os.path.join("temp", "t039") diff --git a/autotest/t040_test.py b/autotest/t040_test.py index ec40e92dc4..a012433230 100644 --- a/autotest/t040_test.py +++ b/autotest/t040_test.py @@ -1,9 +1,11 @@ -import os import copy -import numpy as np +import os + import matplotlib.pyplot as plt +import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t041_test.py b/autotest/t041_test.py index 16c9c487ad..30f2978dd2 100644 --- a/autotest/t041_test.py +++ b/autotest/t041_test.py @@ -1,12 +1,14 @@ """ Test the observation process load and write """ -import pytest import os import shutil + import numpy as np +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t042_test.py b/autotest/t042_test.py index cb54dd2e1d..c247f91f2e 100644 --- a/autotest/t042_test.py +++ b/autotest/t042_test.py @@ -3,11 +3,12 @@ """ import numpy as np + import flopy from flopy.utils.postprocessing import ( + get_gradients, get_transmissivities, get_water_table, - get_gradients, ) mf = flopy.modflow diff --git a/autotest/t043_test.py b/autotest/t043_test.py index 04607fc617..a4df9bd096 100644 --- a/autotest/t043_test.py +++ b/autotest/t043_test.py @@ -1,11 +1,13 @@ """ Test the observation process load and write """ -import os import filecmp -import flopy +import os + import pymake -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t044_test.py b/autotest/t044_test.py index 5b75e90ea1..1b35e49ffa 100644 --- a/autotest/t044_test.py +++ b/autotest/t044_test.py @@ -1,11 +1,13 @@ """ Test the observation process load and write """ -import pytest import os -import flopy + import pymake -from ci_framework import base_test_dir, FlopyTestSetup +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t045_test.py b/autotest/t045_test.py index c6c575afbf..7ee873ecd8 100644 --- a/autotest/t045_test.py +++ b/autotest/t045_test.py @@ -1,11 +1,13 @@ """ Test the gmg load and write with an external summary file """ -import pytest import os -import flopy + import pymake -from ci_framework import base_test_dir, FlopyTestSetup +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t046_test.py b/autotest/t046_test.py index 4e3f3bcb28..796948af72 100644 --- a/autotest/t046_test.py +++ b/autotest/t046_test.py @@ -1,11 +1,13 @@ """ Test the gmg load and write with an external summary file """ -import pytest import os -import flopy + import pymake -from ci_framework import base_test_dir, FlopyTestSetup +import pytest +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t047_test.py b/autotest/t047_test.py index e47ec91ce2..ea2aa6056f 100644 --- a/autotest/t047_test.py +++ b/autotest/t047_test.py @@ -2,9 +2,11 @@ Test the gmg load and write with an external summary file """ import os + +from ci_framework import FlopyTestSetup, base_test_dir + import flopy from flopy.utils.recarray_utils import recarray -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t048_test.py b/autotest/t048_test.py index 3d10130bfe..09822ca742 100644 --- a/autotest/t048_test.py +++ b/autotest/t048_test.py @@ -1,8 +1,10 @@ """ Test the observation process load and write """ -import pytest import os + +import pytest + import flopy try: diff --git a/autotest/t049_test.py b/autotest/t049_test.py index 0dfe08f1b2..824cb0c7ae 100644 --- a/autotest/t049_test.py +++ b/autotest/t049_test.py @@ -1,9 +1,11 @@ # Test loading of MODFLOW and MT3D models that come with MT3D distribution import os -import numpy as np + import matplotlib.pyplot as plt +import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t050_test.py b/autotest/t050_test.py index d8ca12db49..11b3ffcc84 100644 --- a/autotest/t050_test.py +++ b/autotest/t050_test.py @@ -1,10 +1,12 @@ # Test vtk export -import numpy as np import os + +import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy from flopy.export.vtk import Vtk -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) @@ -376,8 +378,8 @@ def test_vtk_vector(): except ImportError: return + from flopy.utils import CellBudgetFile, HeadFile from flopy.utils import postprocessing as pp - from flopy.utils import HeadFile, CellBudgetFile test_setup = FlopyTestSetup(verbose=True) diff --git a/autotest/t051_test.py b/autotest/t051_test.py index 806cb5d30d..56b25de34c 100644 --- a/autotest/t051_test.py +++ b/autotest/t051_test.py @@ -1,7 +1,7 @@ -import os import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t052_test.py b/autotest/t052_test.py index 4516cdd968..365f0bb441 100644 --- a/autotest/t052_test.py +++ b/autotest/t052_test.py @@ -1,8 +1,10 @@ import os + import numpy as np -import flopy import pymake -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t053_test.py b/autotest/t053_test.py index a6d2db8951..754266266e 100644 --- a/autotest/t053_test.py +++ b/autotest/t053_test.py @@ -1,7 +1,9 @@ # test unstructured binary head file import os + import numpy as np + import flopy diff --git a/autotest/t054_test_mfnwt.py b/autotest/t054_test_mfnwt.py index 093b55f7a0..29ad93ba0d 100644 --- a/autotest/t054_test_mfnwt.py +++ b/autotest/t054_test_mfnwt.py @@ -5,10 +5,12 @@ import os import sys -import flopy + import pymake import pytest -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t055_test_mt3d_list.py b/autotest/t055_test_mt3d_list.py index 1b87094420..8dfc3bd3f2 100644 --- a/autotest/t055_test_mt3d_list.py +++ b/autotest/t055_test_mt3d_list.py @@ -1,5 +1,6 @@ import os import warnings + import flopy diff --git a/autotest/t056_test_pcg_fmt.py b/autotest/t056_test_pcg_fmt.py index 8b2fad512e..4b000de8c1 100644 --- a/autotest/t056_test_pcg_fmt.py +++ b/autotest/t056_test_pcg_fmt.py @@ -8,6 +8,7 @@ """ import os + import flopy as fp pcg_fname = os.path.join( diff --git a/autotest/t057_test_mp7.py b/autotest/t057_test_mp7.py index ad3e794b72..4c5eee41a2 100644 --- a/autotest/t057_test_mp7.py +++ b/autotest/t057_test_mp7.py @@ -1,7 +1,9 @@ import os + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t058_test_mp7.py b/autotest/t058_test_mp7.py index 0acd615fc6..0e7859f12d 100644 --- a/autotest/t058_test_mp7.py +++ b/autotest/t058_test_mp7.py @@ -1,8 +1,9 @@ import os + import numpy as np -import flopy +from ci_framework import FlopyTestSetup, base_test_dir -from ci_framework import base_test_dir, FlopyTestSetup +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t059_test_mp7.py b/autotest/t059_test_mp7.py index 77d19a6963..6a1168ad6a 100644 --- a/autotest/t059_test_mp7.py +++ b/autotest/t059_test_mp7.py @@ -1,6 +1,6 @@ -import os +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t060_test_lkt.py b/autotest/t060_test_lkt.py index f1e8107eed..e416199dbd 100644 --- a/autotest/t060_test_lkt.py +++ b/autotest/t060_test_lkt.py @@ -2,10 +2,10 @@ Bug discovered in LKT with multi-species. Adding test to check this functionality """ -import os import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t061_test_gridgen.py b/autotest/t061_test_gridgen.py index 432ad05f31..d8c4b96313 100644 --- a/autotest/t061_test_gridgen.py +++ b/autotest/t061_test_gridgen.py @@ -1,5 +1,7 @@ import os + import numpy as np + import flopy from flopy.utils.gridgen import Gridgen @@ -11,7 +13,7 @@ except ImportError: shapefile = None -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t062_test_intersect.py b/autotest/t062_test_intersect.py index 66df9d022d..e05cfec24b 100644 --- a/autotest/t062_test_intersect.py +++ b/autotest/t062_test_intersect.py @@ -1,7 +1,9 @@ import os -import flopy -import numpy as np + import matplotlib.pyplot as plt +import numpy as np + +import flopy # grid properties nlay = 3 diff --git a/autotest/t063_test_lgrutil.py b/autotest/t063_test_lgrutil.py index 4adaec5965..3ac93d6efa 100644 --- a/autotest/t063_test_lgrutil.py +++ b/autotest/t063_test_lgrutil.py @@ -1,5 +1,5 @@ -import os import numpy as np + from flopy.utils.lgrutil import Lgr diff --git a/autotest/t064_test_performance.py b/autotest/t064_test_performance.py index 92404593a1..6aa64dfafa 100644 --- a/autotest/t064_test_performance.py +++ b/autotest/t064_test_performance.py @@ -2,15 +2,17 @@ Tests to prevent performance regressions """ import os -import sys -import shutil import random +import shutil import string +import sys import time + import numpy as np -import flopy.modflow as fm from ci_framework import base_test_dir +import flopy.modflow as fm + base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t065_test_gridintersect.py b/autotest/t065_test_gridintersect.py index 768955b9e7..3c708358de 100644 --- a/autotest/t065_test_gridintersect.py +++ b/autotest/t065_test_gridintersect.py @@ -1,11 +1,11 @@ -import sys +import os -sys.path.insert(1, "..") -import flopy.discretization as fgrid -import flopy.plot as fplot import matplotlib.pyplot as plt import numpy as np from descartes import PolygonPatch + +import flopy.discretization as fgrid +import flopy.plot as fplot from flopy.utils.triangle import Triangle try: @@ -1299,9 +1299,8 @@ def test_all_intersections_shapely_no_strtree(): def test_rasters(): - from flopy.utils import Raster - import os import flopy as fp + from flopy.utils import Raster ws = os.path.join("..", "examples", "data", "options") raster_name = "dem.img" @@ -1366,9 +1365,8 @@ def test_rasters(): def test_raster_sampling_methods(): - from flopy.utils import Raster - import os import flopy as fp + from flopy.utils import Raster ws = os.path.join("..", "examples", "data", "options") raster_name = "dem.img" diff --git a/autotest/t066_test_copy.py b/autotest/t066_test_copy.py index ab4149c6b1..58159adf41 100644 --- a/autotest/t066_test_copy.py +++ b/autotest/t066_test_copy.py @@ -1,16 +1,18 @@ """Test copying of flopy objects. """ -import os import copy import inspect +import os + import numpy as np + import flopy +from flopy.datbase import DataInterface, DataType +from flopy.mbase import ModelInterface +from flopy.utils import TemporalReference fm = flopy.modflow mf6 = flopy.mf6 -from flopy.datbase import DataType, DataInterface -from flopy.mbase import ModelInterface -from flopy.utils import TemporalReference def get_package_list(model): diff --git a/autotest/t067_test_ulstrd.py b/autotest/t067_test_ulstrd.py index 882d9c1407..cd81ca0de8 100644 --- a/autotest/t067_test_ulstrd.py +++ b/autotest/t067_test_ulstrd.py @@ -1,7 +1,9 @@ import os + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t068_test_ssm.py b/autotest/t068_test_ssm.py index 59cfc8e3b3..f085fcab4f 100644 --- a/autotest/t068_test_ssm.py +++ b/autotest/t068_test_ssm.py @@ -3,9 +3,11 @@ """ import os -import flopy + import numpy as np -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t069_test_vtkexportmodel.py b/autotest/t069_test_vtkexportmodel.py index d4258778f8..547f4ecaab 100644 --- a/autotest/t069_test_vtkexportmodel.py +++ b/autotest/t069_test_vtkexportmodel.py @@ -2,12 +2,10 @@ Test vtk export_model function without packages_names definition """ +from ci_framework import FlopyTestSetup, base_test_dir + import flopy from flopy.export import vtk -from ci_framework import ( - base_test_dir, - FlopyTestSetup, -) mf_exe_name = "mf6" diff --git a/autotest/t070_test_quasi3layers.py b/autotest/t070_test_quasi3layers.py index 3ac01a07ed..b49f288883 100644 --- a/autotest/t070_test_quasi3layers.py +++ b/autotest/t070_test_quasi3layers.py @@ -8,10 +8,12 @@ import os import sys + +import matplotlib.pyplot as plt import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -import matplotlib.pyplot as plt -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t071_test_nwt_ag.py b/autotest/t071_test_nwt_ag.py index 896026c269..b6df4388e8 100644 --- a/autotest/t071_test_nwt_ag.py +++ b/autotest/t071_test_nwt_ag.py @@ -1,7 +1,9 @@ import os -import flopy + import numpy as np -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy mpth = os.path.join("..", "examples", "data", "ag_test") diff --git a/autotest/t072_test_spedis.py b/autotest/t072_test_spedis.py index 78bdda10f5..dbc2db92b7 100644 --- a/autotest/t072_test_spedis.py +++ b/autotest/t072_test_spedis.py @@ -12,11 +12,13 @@ # - the model is a very small synthetic test case that just contains enough # things to allow for the functions to be thoroughly tested -import flopy import os + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy import flopy.utils.binaryfile as bf -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) @@ -499,10 +501,11 @@ def specific_discharge_comprehensive(): def test_specific_discharge_mf6(): - from flopy.mf6.modflow.mfsimulation import MFSimulation import matplotlib.pyplot as plt from matplotlib.quiver import Quiver + from flopy.mf6.modflow.mfsimulation import MFSimulation + test_setup = FlopyTestSetup(verbose=True, test_dirs=modelws_mf6) # build and run MODFLOW 6 model diff --git a/autotest/t073_test_cvfd.py b/autotest/t073_test_cvfd.py index 133d8a4696..2d6a97659c 100644 --- a/autotest/t073_test_cvfd.py +++ b/autotest/t073_test_cvfd.py @@ -1,6 +1,7 @@ import numpy as np + import flopy -from flopy.utils.cvfdutil import to_cvfd, gridlist_to_disv_gridprops +from flopy.utils.cvfdutil import gridlist_to_disv_gridprops, to_cvfd def test_tocvfd1(): diff --git a/autotest/t074_test_geospatial_util.py b/autotest/t074_test_geospatial_util.py index 1110d0b1d2..90492d110f 100644 --- a/autotest/t074_test_geospatial_util.py +++ b/autotest/t074_test_geospatial_util.py @@ -113,16 +113,16 @@ def test_import_geospatial_utils(): from flopy.utils.geospatial_utils import ( - GeoSpatialUtil, GeoSpatialCollection, + GeoSpatialUtil, ) return def test_polygon(): + from flopy.utils.geometry import Polygon, Shape from flopy.utils.geospatial_utils import GeoSpatialUtil - from flopy.utils.geometry import Shape, Polygon poly = Shape.from_geojson(polygon) gi1 = poly.__geo_interface__ @@ -153,8 +153,8 @@ def test_polygon(): def test_polygon_with_hole(): + from flopy.utils.geometry import Polygon, Shape from flopy.utils.geospatial_utils import GeoSpatialUtil - from flopy.utils.geometry import Shape, Polygon poly = Shape.from_geojson(poly_w_hole) gi1 = poly.__geo_interface__ @@ -185,8 +185,8 @@ def test_polygon_with_hole(): def test_multipolygon(): + from flopy.utils.geometry import MultiPolygon, Shape from flopy.utils.geospatial_utils import GeoSpatialUtil - from flopy.utils.geometry import Shape, MultiPolygon poly = Shape.from_geojson(multipolygon) gi1 = poly.__geo_interface__ @@ -219,8 +219,8 @@ def test_multipolygon(): def test_point(): + from flopy.utils.geometry import Point, Shape from flopy.utils.geospatial_utils import GeoSpatialUtil - from flopy.utils.geometry import Shape, Point pt = Shape.from_geojson(point) gi1 = pt.__geo_interface__ @@ -251,8 +251,8 @@ def test_point(): def test_multipoint(): + from flopy.utils.geometry import MultiPoint, Shape from flopy.utils.geospatial_utils import GeoSpatialUtil - from flopy.utils.geometry import Shape, MultiPoint mpt = Shape.from_geojson(multipoint) gi1 = mpt.__geo_interface__ @@ -283,8 +283,8 @@ def test_multipoint(): def test_linestring(): + from flopy.utils.geometry import LineString, Shape from flopy.utils.geospatial_utils import GeoSpatialUtil - from flopy.utils.geometry import Shape, LineString lstr = Shape.from_geojson(linestring) gi1 = lstr.__geo_interface__ @@ -315,8 +315,8 @@ def test_linestring(): def test_multilinestring(): + from flopy.utils.geometry import MultiLineString, Shape from flopy.utils.geospatial_utils import GeoSpatialUtil - from flopy.utils.geometry import Shape, MultiLineString mlstr = Shape.from_geojson(multilinestring) gi1 = mlstr.__geo_interface__ @@ -349,8 +349,8 @@ def test_multilinestring(): def test_polygon_collection(): + from flopy.utils.geometry import Collection, Shape from flopy.utils.geospatial_utils import GeoSpatialCollection - from flopy.utils.geometry import Shape, Collection col = [ Shape.from_geojson(polygon), @@ -387,8 +387,8 @@ def test_polygon_collection(): def test_point_collection(): + from flopy.utils.geometry import Collection, Shape from flopy.utils.geospatial_utils import GeoSpatialCollection - from flopy.utils.geometry import Shape, Collection col = [Shape.from_geojson(point), Shape.from_geojson(multipoint)] @@ -421,8 +421,8 @@ def test_point_collection(): def test_linestring_collection(): + from flopy.utils.geometry import Collection, Shape from flopy.utils.geospatial_utils import GeoSpatialCollection - from flopy.utils.geometry import Shape, Collection col = [Shape.from_geojson(linestring), Shape.from_geojson(multilinestring)] @@ -455,8 +455,8 @@ def test_linestring_collection(): def test_mixed_collection(): + from flopy.utils.geometry import Collection, Shape from flopy.utils.geospatial_utils import GeoSpatialCollection - from flopy.utils.geometry import Shape, Collection col = [ Shape.from_geojson(polygon), diff --git a/autotest/t075_test_ugrid.py b/autotest/t075_test_ugrid.py index a21f8b2a57..f8de805cfe 100644 --- a/autotest/t075_test_ugrid.py +++ b/autotest/t075_test_ugrid.py @@ -4,13 +4,13 @@ """ import os -import shutil import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + from flopy.discretization import UnstructuredGrid, VertexGrid from flopy.utils.triangle import Triangle from flopy.utils.voronoi import VoronoiGrid -from ci_framework import base_test_dir, FlopyTestSetup base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t076_test_modelgrid_thick.py b/autotest/t076_test_modelgrid_thick.py index fed07aff62..93e5aa31af 100644 --- a/autotest/t076_test_modelgrid_thick.py +++ b/autotest/t076_test_modelgrid_thick.py @@ -4,7 +4,8 @@ """ import numpy as np -from flopy.discretization import StructuredGrid, VertexGrid, UnstructuredGrid + +from flopy.discretization import StructuredGrid, UnstructuredGrid, VertexGrid def test_structured_thick(): diff --git a/autotest/t078_test_lake_connections.py b/autotest/t078_test_lake_connections.py index bdeb8ab560..47841bfd00 100644 --- a/autotest/t078_test_lake_connections.py +++ b/autotest/t078_test_lake_connections.py @@ -1,7 +1,9 @@ import os + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy -from ci_framework import base_test_dir, FlopyTestSetup pth = os.path.join("..", "examples", "data", "mf6-freyberg") diff --git a/autotest/t079_test_cbc_full3D.py b/autotest/t079_test_cbc_full3D.py index 943682e604..f39bf6d6db 100644 --- a/autotest/t079_test_cbc_full3D.py +++ b/autotest/t079_test_cbc_full3D.py @@ -1,11 +1,11 @@ import os import sys -import pytest import numpy as np -import flopy +import pytest +from ci_framework import FlopyTestSetup, base_test_dir -from ci_framework import base_test_dir, FlopyTestSetup +import flopy ex_pths = ( os.path.join("..", "examples", "data", "freyberg"), diff --git a/autotest/t080_test.py b/autotest/t080_test.py index f2dabf908e..7e64fb0af5 100644 --- a/autotest/t080_test.py +++ b/autotest/t080_test.py @@ -4,7 +4,6 @@ import os import platform -import numpy as np try: from shapely.geometry import Polygon @@ -13,9 +12,10 @@ Polygon = None +from ci_framework import FlopyTestSetup, base_test_dir + import flopy from flopy.utils.gridgen import Gridgen -from ci_framework import base_test_dir, FlopyTestSetup # Set gridgen executable gridgen_exe = "gridgen" diff --git a/autotest/t501_test.py b/autotest/t501_test.py index aca0b65aac..63256557e2 100644 --- a/autotest/t501_test.py +++ b/autotest/t501_test.py @@ -1,8 +1,9 @@ # Test instantiation of mf6 classes import os -import flopy -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir + +import flopy def test_mf6(): @@ -134,9 +135,10 @@ def test_mf6(): def test_mf6_string_to_file_path(): - from flopy.mf6.mfbase import MFFileMgmt import platform + from flopy.mf6.mfbase import MFFileMgmt + if platform.system().lower() == "windows": unc_path = r"\\server\path\path" new_path = MFFileMgmt.string_to_file_path(unc_path) diff --git a/autotest/t502_test.py b/autotest/t502_test.py index 7b5d9bd3ed..924231b349 100644 --- a/autotest/t502_test.py +++ b/autotest/t502_test.py @@ -1,12 +1,21 @@ -import os +from ci_framework import FlopyTestSetup, base_test_dir import flopy -from flopy.mf6.modflow import mfgwfriv, mfgwfsto, mfgwfoc, mfgwfwel, mfgwfdrn -from flopy.mf6.modflow import mfims, mftdis, mfgwfic, mfgwfnpf, mfgwfdis, mfgwf +from flopy.mf6.modflow import ( + mfgwf, + mfgwfdis, + mfgwfdrn, + mfgwfic, + mfgwfnpf, + mfgwfoc, + mfgwfriv, + mfgwfsto, + mfgwfwel, + mfims, + mftdis, +) from flopy.mf6.modflow.mfsimulation import MFSimulation -from ci_framework import base_test_dir, FlopyTestSetup - base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/autotest/t503_test.py b/autotest/t503_test.py index f794cabbf4..f0fb63ff71 100644 --- a/autotest/t503_test.py +++ b/autotest/t503_test.py @@ -1,14 +1,11 @@ -import pytest -import sys import os import shutil -import flopy + import pymake -from ci_framework import ( - base_test_dir, - FlopyTestSetup, - download_mf6_examples, -) +import pytest +from ci_framework import FlopyTestSetup, base_test_dir, download_mf6_examples + +import flopy exe_name = "mf6" v = flopy.which(exe_name) diff --git a/autotest/t504_test.py b/autotest/t504_test.py index cc8f5ac17f..b0d271e256 100644 --- a/autotest/t504_test.py +++ b/autotest/t504_test.py @@ -1,12 +1,13 @@ -import os, copy +import copy +import os import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir import flopy import flopy.utils.binaryfile as bf -from flopy.utils.datautil import PyListUtil from flopy.mf6.modflow.mfsimulation import MFSimulation -from ci_framework import base_test_dir, FlopyTestSetup +from flopy.utils.datautil import PyListUtil try: import shapefile diff --git a/autotest/t505_test.py b/autotest/t505_test.py index 7bbcec32f4..debb0720ec 100644 --- a/autotest/t505_test.py +++ b/autotest/t505_test.py @@ -1,12 +1,12 @@ import os import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir import flopy import flopy.utils.binaryfile as bf from flopy.mf6.data.mfdatastorage import DataStorageType -from flopy.utils.datautil import PyListUtil -from flopy.mf6.mfbase import FlopyException +from flopy.mf6.mfbase import FlopyException, MFDataException from flopy.mf6.modflow.mfgwf import ModflowGwf from flopy.mf6.modflow.mfgwfchd import ModflowGwfchd from flopy.mf6.modflow.mfgwfdis import ModflowGwfdis @@ -30,12 +30,8 @@ from flopy.mf6.modflow.mfims import ModflowIms from flopy.mf6.modflow.mfsimulation import MFSimulation from flopy.mf6.modflow.mftdis import ModflowTdis -from flopy.mf6.modflow.mfutlobs import ModflowUtlobs -from flopy.mf6.modflow.mfutlts import ModflowUtlts from flopy.mf6.utils import testutils -from flopy.mf6.mfbase import MFDataException -from flopy.mf6.mfbase import ExtFileAction -from ci_framework import base_test_dir, FlopyTestSetup +from flopy.utils.datautil import PyListUtil try: import shapefile @@ -360,8 +356,6 @@ def test_array(): # of zero always used even if aux is defined in a previous stress # period?) - import flopy - mf6 = flopy.mf6 sim_name = "test_array" model_name = "test_array" diff --git a/autotest/t506_test.py b/autotest/t506_test.py index 81e960e83e..610a19a024 100644 --- a/autotest/t506_test.py +++ b/autotest/t506_test.py @@ -6,6 +6,7 @@ import os import platform + import numpy as np try: @@ -21,13 +22,13 @@ try: import matplotlib import matplotlib.pyplot as plt - from matplotlib.collections import QuadMesh, PathCollection, LineCollection + from matplotlib.collections import LineCollection, PathCollection, QuadMesh except: print("Matplotlib not installed, tests cannot be run.") matplotlib = None plt = None -from ci_framework import base_test_dir, FlopyTestSetup +from ci_framework import FlopyTestSetup, base_test_dir # Set gridgen executable gridgen_exe = "gridgen" diff --git a/autotest/t550_test.py b/autotest/t550_test.py index b8c22fd1d3..a6d289e65a 100644 --- a/autotest/t550_test.py +++ b/autotest/t550_test.py @@ -1,11 +1,14 @@ import math + import numpy as np +from ci_framework import FlopyTestSetup, base_test_dir + import flopy +from flopy.discretization import StructuredGrid +from flopy.export.shapefile_utils import shp2recarray fm = flopy.modflow fp6 = flopy.mf6 -from flopy.discretization import StructuredGrid -from flopy.export.shapefile_utils import shp2recarray try: import shapefile @@ -15,8 +18,6 @@ except ImportError: shapefile = None -from ci_framework import base_test_dir, FlopyTestSetup - base_dir = base_test_dir(__file__, rel_path="temp", verbose=True) diff --git a/etc/environment.yml b/etc/environment.yml index a7c0e2143d..2f8f314353 100644 --- a/etc/environment.yml +++ b/etc/environment.yml @@ -11,6 +11,7 @@ dependencies: - pylint - flake8 - black + - isort - coverage - pytest - pytest-xdist diff --git a/etc/requirements.full.pip.txt b/etc/requirements.full.pip.txt index 941c07ab98..39413e8dce 100644 --- a/etc/requirements.full.pip.txt +++ b/etc/requirements.full.pip.txt @@ -5,6 +5,7 @@ numpy>=1.15.0 pylint flake8 black +isort coverage pytest pytest-xdist diff --git a/etc/requirements.pip.txt b/etc/requirements.pip.txt index bc06213829..31feb1653d 100644 --- a/etc/requirements.pip.txt +++ b/etc/requirements.pip.txt @@ -1,4 +1,5 @@ black +isort flake8 pylint coverage diff --git a/etc/requirements.windows.pip.txt b/etc/requirements.windows.pip.txt index 5c4863f995..2eb4e382a4 100644 --- a/etc/requirements.windows.pip.txt +++ b/etc/requirements.windows.pip.txt @@ -5,6 +5,7 @@ numpy>=1.15.0 pylint flake8 black +isort coverage pytest pytest-xdist diff --git a/examples/Testing/flopy3_2L_CS.py b/examples/Testing/flopy3_2L_CS.py index 4b9b7e246d..f04eec5628 100644 --- a/examples/Testing/flopy3_2L_CS.py +++ b/examples/Testing/flopy3_2L_CS.py @@ -1,9 +1,10 @@ -import sys import os import platform -import numpy as np -import matplotlib.pyplot as plt +import sys + import matplotlib.colors +import matplotlib.pyplot as plt +import numpy as np import flopy diff --git a/examples/Testing/flopy3_CrossSectionExample.py b/examples/Testing/flopy3_CrossSectionExample.py index 1d8367e55c..6077e5e729 100644 --- a/examples/Testing/flopy3_CrossSectionExample.py +++ b/examples/Testing/flopy3_CrossSectionExample.py @@ -1,9 +1,9 @@ -import sys import os import platform -import numpy as np -import matplotlib.pyplot as plt + import matplotlib.colors +import matplotlib.pyplot as plt +import numpy as np import flopy diff --git a/examples/Testing/flopy3_Oahu_02_02b.py b/examples/Testing/flopy3_Oahu_02_02b.py index 5ff341a823..c136b4a1a9 100755 --- a/examples/Testing/flopy3_Oahu_02_02b.py +++ b/examples/Testing/flopy3_Oahu_02_02b.py @@ -14,6 +14,7 @@ # ---------------------------------------------------- import os import sys + import numpy as np from pylab import * from PIL import Image, ImageDraw diff --git a/examples/Testing/flopy3_loadSECP.py b/examples/Testing/flopy3_loadSECP.py index 4d38bdc045..5e16c64bb1 100644 --- a/examples/Testing/flopy3_loadSECP.py +++ b/examples/Testing/flopy3_loadSECP.py @@ -1,8 +1,9 @@ -import sys import os import platform -import numpy as np +import sys + import matplotlib.pyplot as plt +import numpy as np import flopy diff --git a/examples/Testing/flopy3_loadSUB.py b/examples/Testing/flopy3_loadSUB.py index 6fdfe659cb..c7f87d09d8 100644 --- a/examples/Testing/flopy3_loadSUB.py +++ b/examples/Testing/flopy3_loadSUB.py @@ -1,5 +1,5 @@ import os -import numpy as np + import flopy pth = os.path.join('..', 'data', 'mf2005_test') diff --git a/examples/Testing/flopy3_loadSWT.py b/examples/Testing/flopy3_loadSWT.py index 85957e13bd..308028da07 100644 --- a/examples/Testing/flopy3_loadSWT.py +++ b/examples/Testing/flopy3_loadSWT.py @@ -1,5 +1,5 @@ import os -import numpy as np + import flopy pth = os.path.join('..', 'data', 'mf2005_test') diff --git a/examples/Testing/flopy3_load_parameters.py b/examples/Testing/flopy3_load_parameters.py index 6d2cb90414..5415565064 100644 --- a/examples/Testing/flopy3_load_parameters.py +++ b/examples/Testing/flopy3_load_parameters.py @@ -1,6 +1,7 @@ -import sys import os import platform +import sys + import numpy as np # -- add development version of flopy to system path @@ -12,7 +13,6 @@ import flopy import flopy.utils as fputl - spth = os.getcwd() mname = 'twrip.nam' diff --git a/examples/Testing/flopy3_loadplotfreyberg.py b/examples/Testing/flopy3_loadplotfreyberg.py index d20782eb88..991f768da7 100644 --- a/examples/Testing/flopy3_loadplotfreyberg.py +++ b/examples/Testing/flopy3_loadplotfreyberg.py @@ -1,5 +1,6 @@ import os import matplotlib.pyplot as plt + import flopy ml = flopy.modflow.Modflow.load('freyberg.nam', version='mf2005', verbose=True, model_ws='data') diff --git a/examples/Testing/flopy3_plotdata.py b/examples/Testing/flopy3_plotdata.py index 013c18ac89..aa07401bde 100644 --- a/examples/Testing/flopy3_plotdata.py +++ b/examples/Testing/flopy3_plotdata.py @@ -1,11 +1,9 @@ import os -import numpy as np import matplotlib.pyplot as plt import flopy - fb = flopy.modflow.Modflow.load('freyberg', version='mf2005', model_ws=os.path.join('..', 'data', 'freyberg'), verbose=True) dis = fb.dis diff --git a/examples/Testing/testunitcbc.py b/examples/Testing/testunitcbc.py index c309811814..b03a40d927 100644 --- a/examples/Testing/testunitcbc.py +++ b/examples/Testing/testunitcbc.py @@ -1,6 +1,8 @@ import os + import numpy as np + import flopy # Assign name and create modflow model object @@ -55,7 +57,9 @@ # Post process the results import matplotlib.pyplot as plt + import flopy.utils.binaryfile as bf + fig = plt.figure(figsize=(10,10)) ax = fig.add_subplot(1, 1, 1, aspect='equal') diff --git a/examples/Testing/util_list_tester.py b/examples/Testing/util_list_tester.py index 1922ec5785..4b4b0fedc7 100644 --- a/examples/Testing/util_list_tester.py +++ b/examples/Testing/util_list_tester.py @@ -1,9 +1,6 @@ -import os -import sys -import warnings import numpy as np + import flopy -from flopy.utils import MfList # instance testing #override the default data type diff --git a/examples/common/setup_pmv_demo.py b/examples/common/setup_pmv_demo.py index cc9151c5f3..5956433d35 100644 --- a/examples/common/setup_pmv_demo.py +++ b/examples/common/setup_pmv_demo.py @@ -1,8 +1,8 @@ -import matplotlib as mpl -import numpy as np import os -import platform import sys + +import numpy as np + try: import flopy except: diff --git a/examples/groundwater_paper/scripts/uspb_capture.py b/examples/groundwater_paper/scripts/uspb_capture.py index a0bdfcbfdf..20c14d67a0 100644 --- a/examples/groundwater_paper/scripts/uspb_capture.py +++ b/examples/groundwater_paper/scripts/uspb_capture.py @@ -1,6 +1,7 @@ import os import sys import time + import numpy as np import flopy diff --git a/examples/groundwater_paper/scripts/uspb_capture_par.py b/examples/groundwater_paper/scripts/uspb_capture_par.py index 8bb4e36f1b..0fbbaf0355 100644 --- a/examples/groundwater_paper/scripts/uspb_capture_par.py +++ b/examples/groundwater_paper/scripts/uspb_capture_par.py @@ -2,15 +2,15 @@ # modified to run in parallel on mac and windows os # +import multiprocessing as mp import os -import sys import platform import shutil +import subprocess as sp +import sys import time -import numpy as np -import subprocess as sp -import multiprocessing as mp +import numpy as np import flopy diff --git a/examples/scripts/flopy_henry.py b/examples/scripts/flopy_henry.py index e7d5d37379..99943bc986 100644 --- a/examples/scripts/flopy_henry.py +++ b/examples/scripts/flopy_henry.py @@ -1,7 +1,9 @@ import os import sys -import numpy as np + import matplotlib.pyplot as plt +import numpy as np + import flopy diff --git a/examples/scripts/flopy_lake_example.py b/examples/scripts/flopy_lake_example.py index c7c6a85099..1f20646b8d 100644 --- a/examples/scripts/flopy_lake_example.py +++ b/examples/scripts/flopy_lake_example.py @@ -1,7 +1,8 @@ import os import sys -import numpy as np + import matplotlib.pyplot as plt +import numpy as np import flopy diff --git a/examples/scripts/flopy_swi2_ex1.py b/examples/scripts/flopy_swi2_ex1.py index 472b0d5702..0fc5b0a64a 100755 --- a/examples/scripts/flopy_swi2_ex1.py +++ b/examples/scripts/flopy_swi2_ex1.py @@ -1,13 +1,12 @@ +import math import os import sys -import math +import matplotlib.pyplot as plt import numpy as np import flopy -import matplotlib.pyplot as plt - # --modify default matplotlib settings updates = { "font.family": ["Univers 57 Condensed", "Arial"], diff --git a/examples/scripts/flopy_swi2_ex2.py b/examples/scripts/flopy_swi2_ex2.py index 0ba92a9d32..b4288fee78 100755 --- a/examples/scripts/flopy_swi2_ex2.py +++ b/examples/scripts/flopy_swi2_ex2.py @@ -1,12 +1,11 @@ import os import sys +import matplotlib.pyplot as plt import numpy as np import flopy -import matplotlib.pyplot as plt - # --modify default matplotlib settings updates = { "font.family": ["Univers 57 Condensed", "Arial"], diff --git a/examples/scripts/flopy_swi2_ex3.py b/examples/scripts/flopy_swi2_ex3.py index ac0bba3309..78ef5344cc 100755 --- a/examples/scripts/flopy_swi2_ex3.py +++ b/examples/scripts/flopy_swi2_ex3.py @@ -1,12 +1,11 @@ import os import sys +import matplotlib.pyplot as plt import numpy as np import flopy -import matplotlib.pyplot as plt - # --modify default matplotlib settings updates = { "font.family": ["Univers 57 Condensed", "Arial"], diff --git a/examples/scripts/flopy_swi2_ex4.py b/examples/scripts/flopy_swi2_ex4.py index 3fac5ca8e4..2316398499 100644 --- a/examples/scripts/flopy_swi2_ex4.py +++ b/examples/scripts/flopy_swi2_ex4.py @@ -2,12 +2,11 @@ import platform import sys +import matplotlib.pyplot as plt import numpy as np import flopy -import matplotlib.pyplot as plt - # --modify default matplotlib settings updates = { "font.family": ["Univers 57 Condensed", "Arial"], diff --git a/examples/scripts/flopy_swi2_ex5.py b/examples/scripts/flopy_swi2_ex5.py index aeeee9c58b..af3a518da0 100755 --- a/examples/scripts/flopy_swi2_ex5.py +++ b/examples/scripts/flopy_swi2_ex5.py @@ -1,13 +1,12 @@ +import math import os import sys -import math +import matplotlib.pyplot as plt import numpy as np import flopy -import matplotlib.pyplot as plt - # --modify default matplotlib settings updates = { "font.family": ["Univers 57 Condensed", "Arial"], diff --git a/flopy/__init__.py b/flopy/__init__.py index 103353bd3d..fe570e900d 100644 --- a/flopy/__init__.py +++ b/flopy/__init__.py @@ -20,22 +20,21 @@ """ -from .version import __version__, __author__, __author_email__ - -# imports -from . import modflow -from . import mt3d -from . import seawat -from . import modpath -from . import modflowlgr -from . import mfusg -from . import utils -from . import plot -from . import export -from . import pest -from . import mf6 -from . import discretization - +from .version import __author__, __author_email__, __version__ # isort:skip +from . import ( + discretization, + export, + mf6, + mfusg, + modflow, + modflowlgr, + modpath, + mt3d, + pest, + plot, + seawat, + utils, +) from .mbase import run_model, which __all__ = [ diff --git a/flopy/discretization/__init__.py b/flopy/discretization/__init__.py index 56e3ee1c57..4a3ec1c7d1 100644 --- a/flopy/discretization/__init__.py +++ b/flopy/discretization/__init__.py @@ -1,3 +1,3 @@ from .structuredgrid import StructuredGrid -from .vertexgrid import VertexGrid from .unstructuredgrid import UnstructuredGrid +from .vertexgrid import VertexGrid diff --git a/flopy/discretization/grid.py b/flopy/discretization/grid.py index e09c837fb7..80d259e468 100644 --- a/flopy/discretization/grid.py +++ b/flopy/discretization/grid.py @@ -1,6 +1,9 @@ -import numpy as np -import copy, os +import copy +import os import warnings + +import numpy as np + from ..utils import geometry diff --git a/flopy/discretization/structuredgrid.py b/flopy/discretization/structuredgrid.py index b7153f9368..67844e4cac 100644 --- a/flopy/discretization/structuredgrid.py +++ b/flopy/discretization/structuredgrid.py @@ -1,9 +1,10 @@ import copy -import os.path import inspect +import os.path import numpy as np -from .grid import Grid, CachedData + +from .grid import CachedData, Grid def array_at_verts_basic2d(a): diff --git a/flopy/discretization/unstructuredgrid.py b/flopy/discretization/unstructuredgrid.py index 782c35b7f5..902cf3995f 100644 --- a/flopy/discretization/unstructuredgrid.py +++ b/flopy/discretization/unstructuredgrid.py @@ -1,12 +1,12 @@ -import os import copy -import numpy as np import inspect +import os +import numpy as np from matplotlib.path import Path -from .grid import Grid, CachedData from ..utils.geometry import is_clockwise +from .grid import CachedData, Grid class UnstructuredGrid(Grid): diff --git a/flopy/discretization/vertexgrid.py b/flopy/discretization/vertexgrid.py index 54ad1bf775..eb8f16c4b5 100644 --- a/flopy/discretization/vertexgrid.py +++ b/flopy/discretization/vertexgrid.py @@ -1,12 +1,12 @@ -import os import copy -import numpy as np import inspect +import os +import numpy as np from matplotlib.path import Path -from .grid import Grid, CachedData from ..utils.geometry import is_clockwise +from .grid import CachedData, Grid class VertexGrid(Grid): diff --git a/flopy/export/__init__.py b/flopy/export/__init__.py index 69570c861e..0f39e9cb3a 100644 --- a/flopy/export/__init__.py +++ b/flopy/export/__init__.py @@ -1,6 +1,2 @@ -# imports -from .netcdf import NetCdf -from . import utils -from . import shapefile_utils -from .netcdf import Logger -from . import metadata +from .netcdf import Logger, NetCdf # isort:skip +from . import metadata, shapefile_utils, utils diff --git a/flopy/export/metadata.py b/flopy/export/metadata.py index 36cefcf3d1..687488f92b 100644 --- a/flopy/export/metadata.py +++ b/flopy/export/metadata.py @@ -1,7 +1,7 @@ import numpy as np -from ..utils.flopy_io import get_url_text from ..utils import import_optional_dependency +from ..utils.flopy_io import get_url_text class acdd: diff --git a/flopy/export/netcdf.py b/flopy/export/netcdf.py index f5b2e57af2..3484423714 100644 --- a/flopy/export/netcdf.py +++ b/flopy/export/netcdf.py @@ -1,15 +1,16 @@ +import copy +import json import os import platform import socket -import copy -import json -import numpy as np -from datetime import datetime import time -from .metadata import acdd +from datetime import datetime + +import numpy as np from ..utils import import_optional_dependency from .longnames import NC_LONG_NAMES +from .metadata import acdd # globals FILLVALUE = -99999.9 @@ -749,8 +750,8 @@ def initialize_file(self, time_values=None): self.model.dis.perlen and self.start_datetime """ - from ..version import __version__ as version from ..export.shapefile_utils import CRS + from ..version import __version__ as version if self.nc is not None: raise Exception("nc file already initialized") diff --git a/flopy/export/shapefile_utils.py b/flopy/export/shapefile_utils.py index cfce7dbac8..69d67cc12e 100755 --- a/flopy/export/shapefile_utils.py +++ b/flopy/export/shapefile_utils.py @@ -3,15 +3,15 @@ """ import copy -import shutil import json -import numpy as np import os +import shutil import warnings -from ..datbase import DataType, DataInterface -from ..utils import Util3d, import_optional_dependency +import numpy as np +from ..datbase import DataInterface, DataType +from ..utils import Util3d, import_optional_dependency # web address of spatial reference dot org srefhttp = "https://spatialreference.org" diff --git a/flopy/export/utils.py b/flopy/export/utils.py index 109b5745ec..af6d560d3f 100644 --- a/flopy/export/utils.py +++ b/flopy/export/utils.py @@ -1,19 +1,19 @@ import os + import numpy as np + +from ..datbase import DataInterface, DataListInterface, DataType +from ..mbase import BaseModel, ModelInterface +from ..pakbase import PackageInterface from ..utils import ( - HeadFile, CellBudgetFile, - UcnFile, FormattedHeadFile, + HeadFile, + UcnFile, ZBNetOutput, + import_optional_dependency, ) -from ..mbase import BaseModel, ModelInterface -from ..pakbase import PackageInterface -from ..datbase import DataType, DataInterface, DataListInterface -from . import NetCdf, netcdf -from . import shapefile_utils -from . import vtk -from ..utils import import_optional_dependency +from . import NetCdf, netcdf, shapefile_utils, vtk from .longnames import NC_LONG_NAMES from .unitsformat import NC_UNITS_FORMAT diff --git a/flopy/export/vtk.py b/flopy/export/vtk.py index 93ff7a0919..6cb648f62f 100644 --- a/flopy/export/vtk.py +++ b/flopy/export/vtk.py @@ -5,11 +5,11 @@ import os import warnings + import numpy as np -from ..datbase import DataType, DataInterface -from ..utils import Util3d -from ..utils import import_optional_dependency +from ..datbase import DataInterface, DataType +from ..utils import Util3d, import_optional_dependency warnings.simplefilter("always", DeprecationWarning) diff --git a/flopy/mbase.py b/flopy/mbase.py index fa13f322ba..f04fc803bc 100644 --- a/flopy/mbase.py +++ b/flopy/mbase.py @@ -5,20 +5,21 @@ """ import abc +import copy import os +import queue as Queue import shutil import threading import warnings -import queue as Queue - from datetime import datetime from shutil import which -from subprocess import Popen, PIPE, STDOUT -import copy +from subprocess import PIPE, STDOUT, Popen + import numpy as np -from . import utils, discretization -from .version import __version__ + +from . import discretization, utils from .discretization.grid import Grid +from .version import __version__ ## Global variables # Multiplier for individual array elements in integer and real arrays read by diff --git a/flopy/mf6/__init__.py b/flopy/mf6/__init__.py index 609f2b3abd..624b2090f5 100644 --- a/flopy/mf6/__init__.py +++ b/flopy/mf6/__init__.py @@ -1,9 +1,5 @@ -# imports -from . import coordinates -from . import data -from .modflow import * -from . import utils - -from .data import mfdatascalar, mfdatalist, mfdataarray -from .mfmodel import MFModel +from . import coordinates, data, utils +from .data import mfdataarray, mfdatalist, mfdatascalar from .mfbase import ExtFileAction +from .mfmodel import MFModel +from .modflow import * diff --git a/flopy/mf6/coordinates/__init__.py b/flopy/mf6/coordinates/__init__.py index 425ab6c146..e69de29bb2 100644 --- a/flopy/mf6/coordinates/__init__.py +++ b/flopy/mf6/coordinates/__init__.py @@ -1 +0,0 @@ -# imports diff --git a/flopy/mf6/coordinates/modeldimensions.py b/flopy/mf6/coordinates/modeldimensions.py index ccda4173dd..f4d049f4e6 100644 --- a/flopy/mf6/coordinates/modeldimensions.py +++ b/flopy/mf6/coordinates/modeldimensions.py @@ -5,12 +5,13 @@ """ import sys -from .simulationtime import SimulationTime -from .modelgrid import UnstructuredModelGrid, ModelGrid -from ..mfbase import StructException, FlopyException, VerbosityLevel + +from ...utils.datautil import DatumUtil, NameIter from ..data.mfstructure import DatumType +from ..mfbase import FlopyException, StructException, VerbosityLevel from ..utils.mfenums import DiscretizationType -from ...utils.datautil import DatumUtil, NameIter +from .modelgrid import ModelGrid, UnstructuredModelGrid +from .simulationtime import SimulationTime class DataDimensions: diff --git a/flopy/mf6/coordinates/modelgrid.py b/flopy/mf6/coordinates/modelgrid.py index 21e0e8961e..538594a2ea 100644 --- a/flopy/mf6/coordinates/modelgrid.py +++ b/flopy/mf6/coordinates/modelgrid.py @@ -1,6 +1,7 @@ import numpy as np -from ..utils.mfenums import DiscretizationType + from ..data.mfstructure import MFStructure +from ..utils.mfenums import DiscretizationType class MFGridException(Exception): diff --git a/flopy/mf6/data/__init__.py b/flopy/mf6/data/__init__.py index 99fb6d97cd..b9aa28b172 100644 --- a/flopy/mf6/data/__init__.py +++ b/flopy/mf6/data/__init__.py @@ -1,4 +1 @@ -# imports -from . import mfdataarray -from . import mfdatalist -from . import mfdatascalar +from . import mfdataarray, mfdatalist, mfdatascalar diff --git a/flopy/mf6/data/mfdata.py b/flopy/mf6/data/mfdata.py index b7d0fdf774..b2aa199d33 100644 --- a/flopy/mf6/data/mfdata.py +++ b/flopy/mf6/data/mfdata.py @@ -1,19 +1,20 @@ -from operator import itemgetter -import sys import inspect +import sys +from operator import itemgetter + +from ...datbase import DataInterface, DataType +from ...mbase import ModelInterface +from ...utils import datautil +from ..coordinates.modeldimensions import DataDimensions, DiscretizationType +from ..data.mfstructure import DatumType from ..mfbase import ( + FlopyException, MFDataException, MFInvalidTransientBlockHeaderException, - FlopyException, VerbosityLevel, ) -from ..data.mfstructure import DatumType -from ..coordinates.modeldimensions import DataDimensions, DiscretizationType -from ...datbase import DataInterface, DataType -from ...utils import datautil from .mfdatastorage import DataStructureType from .mfdatautil import to_string -from ...mbase import ModelInterface class MFTransient: diff --git a/flopy/mf6/data/mfdataarray.py b/flopy/mf6/data/mfdataarray.py index 12d64df0a0..2785b28acf 100644 --- a/flopy/mf6/data/mfdataarray.py +++ b/flopy/mf6/data/mfdataarray.py @@ -1,14 +1,18 @@ -import sys, inspect, copy, os +import copy +import inspect +import os +import sys + import numpy as np + +from ...datbase import DataType +from ...utils.datautil import DatumUtil, MultiList from ..data.mfstructure import DatumType -from .mfdatastorage import DataStorage, DataStructureType, DataStorageType -from ...utils.datautil import MultiList, DatumUtil from ..mfbase import ExtFileAction, MFDataException, VerbosityLevel from ..utils.mfenums import DiscretizationType -from ...datbase import DataType -from .mffileaccess import MFFileAccessArray from .mfdata import MFMultiDimVar, MFTransient -from ...mbase import ModelInterface +from .mfdatastorage import DataStorage, DataStorageType, DataStructureType +from .mffileaccess import MFFileAccessArray class MFArray(MFMultiDimVar): diff --git a/flopy/mf6/data/mfdatalist.py b/flopy/mf6/data/mfdatalist.py index 3c2f45c95c..5a0b1f07d5 100644 --- a/flopy/mf6/data/mfdatalist.py +++ b/flopy/mf6/data/mfdatalist.py @@ -1,18 +1,20 @@ +import inspect import math -import sys import os -import inspect +import sys + import numpy as np -from ..utils.mfenums import DiscretizationType -from ..data import mfstructure, mfdata -from ..mfbase import MFDataException, ExtFileAction, VerbosityLevel -from .mfstructure import DatumType -from ...utils import datautil + from ...datbase import DataListInterface, DataType from ...mbase import ModelInterface -from .mffileaccess import MFFileAccessList +from ...utils import datautil +from ..data import mfdata, mfstructure +from ..mfbase import ExtFileAction, MFDataException, VerbosityLevel +from ..utils.mfenums import DiscretizationType from .mfdatastorage import DataStorage, DataStorageType, DataStructureType from .mfdatautil import to_string +from .mffileaccess import MFFileAccessList +from .mfstructure import DatumType class MFList(mfdata.MFMultiDimVar, DataListInterface): diff --git a/flopy/mf6/data/mfdatascalar.py b/flopy/mf6/data/mfdatascalar.py index fa509307fa..074fbae2cc 100644 --- a/flopy/mf6/data/mfdatascalar.py +++ b/flopy/mf6/data/mfdatascalar.py @@ -1,13 +1,16 @@ -import sys, inspect +import inspect +import sys + import numpy as np -from ..data.mfstructure import DatumType -from ..data import mfdata -from ..mfbase import ExtFileAction, MFDataException + from ...datbase import DataType from ...utils.datautil import clean_filename +from ..data import mfdata +from ..data.mfstructure import DatumType +from ..mfbase import ExtFileAction, MFDataException +from .mfdatastorage import DataStorage, DataStorageType, DataStructureType from .mfdatautil import convert_data, to_string from .mffileaccess import MFFileAccessScalar -from .mfdatastorage import DataStorage, DataStructureType, DataStorageType class MFScalar(mfdata.MFData): diff --git a/flopy/mf6/data/mfdatastorage.py b/flopy/mf6/data/mfdatastorage.py index 5881c52688..72ec083196 100644 --- a/flopy/mf6/data/mfdatastorage.py +++ b/flopy/mf6/data/mfdatastorage.py @@ -1,25 +1,25 @@ -from copy import deepcopy -import sys -import os import inspect -from shutil import copyfile +import os +import sys +from copy import deepcopy from enum import Enum +from shutil import copyfile + import numpy as np -from ..mfbase import MFDataException, VerbosityLevel -from ..data.mfstructure import DatumType, MFDataItemStructure -from ..data import mfdatautil -from .mfdatautil import iterable + from ...utils.datautil import ( + ArrayIndexIter, DatumUtil, - FileIter, + MultiList, MultiListIter, PyListUtil, - ArrayIndexIter, - MultiList, clean_filename, ) -from .mfdatautil import convert_data, MFComment -from .mffileaccess import MFFileAccessArray, MFFileAccessList, MFFileAccess +from ..data import mfdatautil +from ..data.mfstructure import DatumType, MFDataItemStructure +from ..mfbase import MFDataException, VerbosityLevel +from .mfdatautil import MFComment, convert_data, iterable +from .mffileaccess import MFFileAccess, MFFileAccessArray, MFFileAccessList class DataStorageType(Enum): diff --git a/flopy/mf6/data/mfdatautil.py b/flopy/mf6/data/mfdatautil.py index 7a7528377f..dfe8470608 100644 --- a/flopy/mf6/data/mfdatautil.py +++ b/flopy/mf6/data/mfdatautil.py @@ -1,11 +1,14 @@ -import sys, inspect -import numpy as np -from copy import deepcopy +import inspect +import struct +import sys from collections.abc import Iterable -from ..mfbase import MFDataException, FlopyException +from copy import deepcopy + +import numpy as np + +from ...utils.datautil import DatumUtil, PyListUtil +from ..mfbase import FlopyException, MFDataException from .mfstructure import DatumType -from ...utils.datautil import PyListUtil, DatumUtil -import struct def iterable(obj, any_iterator=False): @@ -479,8 +482,8 @@ def __init__(self, path): self.path = path def _get_data_dimensions(self, model): - from ..data import mfstructure from ..coordinates import modeldimensions + from ..data import mfstructure # get structure info sim_struct = mfstructure.MFStructure().sim_struct diff --git a/flopy/mf6/data/mffileaccess.py b/flopy/mf6/data/mffileaccess.py index d7fb7787ce..5c3a4f9d01 100644 --- a/flopy/mf6/data/mffileaccess.py +++ b/flopy/mf6/data/mffileaccess.py @@ -1,17 +1,15 @@ -import sys, inspect +import inspect +import sys from copy import deepcopy + import numpy as np -from ..mfbase import MFDataException, VerbosityLevel -from ...utils.datautil import ( - PyListUtil, - find_keyword, - DatumUtil, - MultiListIter, -) -from .mfdatautil import convert_data, to_string, MFComment -from ...utils.binaryfile import BinaryHeader + from ...utils import datautil -from ..data.mfstructure import DatumType, MFDataStructure, DataType +from ...utils.binaryfile import BinaryHeader +from ...utils.datautil import DatumUtil, PyListUtil, find_keyword +from ..data.mfstructure import DataType, DatumType, MFDataStructure +from ..mfbase import MFDataException, VerbosityLevel +from .mfdatautil import MFComment, convert_data, to_string class MFFileAccess: diff --git a/flopy/mf6/data/mfstructure.py b/flopy/mf6/data/mfstructure.py index d96b7e1746..2f6cc7a9e7 100644 --- a/flopy/mf6/data/mfstructure.py +++ b/flopy/mf6/data/mfstructure.py @@ -3,15 +3,15 @@ """ -import os -import traceback import ast import keyword +import os from enum import Enum from textwrap import TextWrapper + import numpy as np -from ..mfbase import PackageContainer, StructException +from ..mfbase import PackageContainer, StructException numeric_index_text = ( "This argument is an index variable, which means that " diff --git a/flopy/mf6/mfbase.py b/flopy/mf6/mfbase.py index 974667ca52..15e42f02ea 100644 --- a/flopy/mf6/mfbase.py +++ b/flopy/mf6/mfbase.py @@ -1,9 +1,12 @@ """ Base classes for Modflow 6 """ -import inspect, sys, traceback -import os, copy +import copy +import inspect +import os +import sys +import traceback from collections.abc import Iterable -from shutil import copyfile from enum import Enum +from shutil import copyfile # internal handled exceptions diff --git a/flopy/mf6/mfmodel.py b/flopy/mf6/mfmodel.py index 828d609c5a..09aa5357c6 100644 --- a/flopy/mf6/mfmodel.py +++ b/flopy/mf6/mfmodel.py @@ -1,28 +1,32 @@ -import os, sys, inspect, warnings +import inspect +import os +import sys + import numpy as np + +from ..discretization.grid import Grid +from ..discretization.modeltime import ModelTime +from ..discretization.structuredgrid import StructuredGrid +from ..discretization.unstructuredgrid import UnstructuredGrid +from ..discretization.vertexgrid import VertexGrid +from ..mbase import ModelInterface +from ..utils import datautil +from ..utils.check import mf6check +from .coordinates import modeldimensions +from .data import mfstructure +from .data.mfdatautil import DataSearchOutput, iterable from .mfbase import ( - PackageContainer, ExtFileAction, - PackageContainerType, + FlopyException, MFDataException, + PackageContainer, + PackageContainerType, ReadAsArraysException, - FlopyException, VerbosityLevel, ) from .mfpackage import MFPackage -from .coordinates import modeldimensions -from ..utils import datautil -from ..discretization.structuredgrid import StructuredGrid -from ..discretization.vertexgrid import VertexGrid -from ..discretization.unstructuredgrid import UnstructuredGrid -from ..discretization.grid import Grid -from ..discretization.modeltime import ModelTime -from ..mbase import ModelInterface from .utils.mfenums import DiscretizationType -from .data import mfstructure -from .data.mfdatautil import iterable, DataSearchOutput from .utils.output_util import MF6Output -from ..utils.check import mf6check class MFModel(PackageContainer, ModelInterface): diff --git a/flopy/mf6/mfpackage.py b/flopy/mf6/mfpackage.py index a9fa93fb66..18bda23f19 100644 --- a/flopy/mf6/mfpackage.py +++ b/flopy/mf6/mfpackage.py @@ -1,32 +1,33 @@ -import os -import sys +import copy +import datetime import errno import inspect -import datetime -import copy +import os +import sys + import numpy as np -from .mfbase import PackageContainer, ExtFileAction, PackageContainerType +from ..mbase import ModelInterface +from ..pakbase import PackageInterface +from ..utils import datautil +from ..utils.check import mf6check +from ..version import __version__ +from .coordinates import modeldimensions +from .data import mfdata, mfdataarray, mfdatalist, mfdatascalar, mfstructure +from .data.mfdatautil import DataSearchOutput, MFComment, cellids_equal +from .data.mfstructure import DatumType, MFDataItemStructure from .mfbase import ( - MFFileMgmt, + ExtFileAction, + FlopyException, MFDataException, - ReadAsArraysException, + MFFileMgmt, MFInvalidTransientBlockHeaderException, + PackageContainer, + PackageContainerType, + ReadAsArraysException, VerbosityLevel, - FlopyException, ) -from .data.mfstructure import DatumType -from .data import mfstructure, mfdata -from ..utils import datautil -from .data import mfdataarray, mfdatalist, mfdatascalar -from .data.mfstructure import MFDataItemStructure -from .coordinates import modeldimensions -from ..pakbase import PackageInterface -from .data.mfdatautil import MFComment, cellids_equal, DataSearchOutput -from ..utils.check import mf6check from .utils.output_util import MF6Output -from ..mbase import ModelInterface -from ..version import __version__ class MFBlockHeader: diff --git a/flopy/mf6/modflow/__init__.py b/flopy/mf6/modflow/__init__.py index 40a609892d..fb4ef373da 100644 --- a/flopy/mf6/modflow/__init__.py +++ b/flopy/mf6/modflow/__init__.py @@ -1,51 +1,35 @@ -# imports -from .mfsimulation import MFSimulation -from .mfnam import ModflowNam -from .mftdis import ModflowTdis -from .mfgwfgwf import ModflowGwfgwf -from .mfims import ModflowIms -from .mfmvr import ModflowMvr +from .mfsimulation import MFSimulation # isort:skip from .mfgnc import ModflowGnc -from .mfgwfgwt import ModflowGwfgwt -from .mfutlobs import ModflowUtlobs -from .mfutlts import ModflowUtlts -from .mfutltas import ModflowUtltas -from .mfutlats import ModflowUtlats -from .mfutllaktab import ModflowUtllaktab -from .mfutlsfrtab import ModflowUtlsfrtab -from .mfutlspc import ModflowUtlspc -from .mfutlspca import ModflowUtlspca -from .mfutltvk import ModflowUtltvk -from .mfutltvs import ModflowUtltvs -from .mfgwfnam import ModflowGwfnam from .mfgwf import ModflowGwf +from .mfgwfapi import ModflowGwfapi +from .mfgwfbuy import ModflowGwfbuy +from .mfgwfchd import ModflowGwfchd +from .mfgwfcsub import ModflowGwfcsub from .mfgwfdis import ModflowGwfdis -from .mfgwfdisv import ModflowGwfdisv from .mfgwfdisu import ModflowGwfdisu -from .mfgwfic import ModflowGwfic -from .mfgwfnpf import ModflowGwfnpf -from .mfgwfsto import ModflowGwfsto -from .mfgwfhfb import ModflowGwfhfb -from .mfgwfchd import ModflowGwfchd -from .mfgwfwel import ModflowGwfwel +from .mfgwfdisv import ModflowGwfdisv from .mfgwfdrn import ModflowGwfdrn -from .mfgwfriv import ModflowGwfriv -from .mfgwfghb import ModflowGwfghb -from .mfgwfrch import ModflowGwfrch -from .mfgwfrcha import ModflowGwfrcha from .mfgwfevt import ModflowGwfevt from .mfgwfevta import ModflowGwfevta -from .mfgwfmaw import ModflowGwfmaw -from .mfgwfsfr import ModflowGwfsfr +from .mfgwfghb import ModflowGwfghb +from .mfgwfgnc import ModflowGwfgnc +from .mfgwfgwf import ModflowGwfgwf +from .mfgwfgwt import ModflowGwfgwt +from .mfgwfhfb import ModflowGwfhfb +from .mfgwfic import ModflowGwfic from .mfgwflak import ModflowGwflak -from .mfgwfuzf import ModflowGwfuzf +from .mfgwfmaw import ModflowGwfmaw from .mfgwfmvr import ModflowGwfmvr -from .mfgwfgnc import ModflowGwfgnc +from .mfgwfnam import ModflowGwfnam +from .mfgwfnpf import ModflowGwfnpf from .mfgwfoc import ModflowGwfoc -from .mfgwfapi import ModflowGwfapi -from .mfgwfbuy import ModflowGwfbuy -from .mfgwfcsub import ModflowGwfcsub -from .mfgwtnam import ModflowGwtnam +from .mfgwfrch import ModflowGwfrch +from .mfgwfrcha import ModflowGwfrcha +from .mfgwfriv import ModflowGwfriv +from .mfgwfsfr import ModflowGwfsfr +from .mfgwfsto import ModflowGwfsto +from .mfgwfuzf import ModflowGwfuzf +from .mfgwfwel import ModflowGwfwel from .mfgwt import ModflowGwt from .mfgwtadv import ModflowGwtadv from .mfgwtapi import ModflowGwtapi @@ -61,8 +45,23 @@ from .mfgwtmst import ModflowGwtmst from .mfgwtmvt import ModflowGwtmvt from .mfgwtmwt import ModflowGwtmwt +from .mfgwtnam import ModflowGwtnam from .mfgwtoc import ModflowGwtoc from .mfgwtsft import ModflowGwtsft from .mfgwtsrc import ModflowGwtsrc from .mfgwtssm import ModflowGwtssm from .mfgwtuzt import ModflowGwtuzt +from .mfims import ModflowIms +from .mfmvr import ModflowMvr +from .mfnam import ModflowNam +from .mftdis import ModflowTdis +from .mfutlats import ModflowUtlats +from .mfutllaktab import ModflowUtllaktab +from .mfutlobs import ModflowUtlobs +from .mfutlsfrtab import ModflowUtlsfrtab +from .mfutlspc import ModflowUtlspc +from .mfutlspca import ModflowUtlspca +from .mfutltas import ModflowUtltas +from .mfutlts import ModflowUtlts +from .mfutltvk import ModflowUtltvk +from .mfutltvs import ModflowUtltvs diff --git a/flopy/mf6/modflow/mfgwf.py b/flopy/mf6/modflow/mfgwf.py index a57e64a082..25f42132d9 100644 --- a/flopy/mf6/modflow/mfgwf.py +++ b/flopy/mf6/modflow/mfgwf.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfmodel -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowGwf(mfmodel.MFModel): diff --git a/flopy/mf6/modflow/mfgwfcsub.py b/flopy/mf6/modflow/mfgwfcsub.py index bd3cecb7f6..9727db126d 100644 --- a/flopy/mf6/modflow/mfgwfcsub.py +++ b/flopy/mf6/modflow/mfgwfcsub.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowGwfcsub(mfpackage.MFPackage): diff --git a/flopy/mf6/modflow/mfgwfevta.py b/flopy/mf6/modflow/mfgwfevta.py index eba5430064..cff9a1a152 100644 --- a/flopy/mf6/modflow/mfgwfevta.py +++ b/flopy/mf6/modflow/mfgwfevta.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowGwfevta(mfpackage.MFPackage): diff --git a/flopy/mf6/modflow/mfgwfnpf.py b/flopy/mf6/modflow/mfgwfnpf.py index f5c1925c03..ed84e1236d 100644 --- a/flopy/mf6/modflow/mfgwfnpf.py +++ b/flopy/mf6/modflow/mfgwfnpf.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowGwfnpf(mfpackage.MFPackage): diff --git a/flopy/mf6/modflow/mfgwfrcha.py b/flopy/mf6/modflow/mfgwfrcha.py index c061072535..78bc4f33d8 100644 --- a/flopy/mf6/modflow/mfgwfrcha.py +++ b/flopy/mf6/modflow/mfgwfrcha.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowGwfrcha(mfpackage.MFPackage): diff --git a/flopy/mf6/modflow/mfgwfsto.py b/flopy/mf6/modflow/mfgwfsto.py index 9b0f23cd55..266f1f24b0 100644 --- a/flopy/mf6/modflow/mfgwfsto.py +++ b/flopy/mf6/modflow/mfgwfsto.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowGwfsto(mfpackage.MFPackage): diff --git a/flopy/mf6/modflow/mfgwt.py b/flopy/mf6/modflow/mfgwt.py index edf735cbbf..6c4575a888 100644 --- a/flopy/mf6/modflow/mfgwt.py +++ b/flopy/mf6/modflow/mfgwt.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfmodel -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowGwt(mfmodel.MFModel): diff --git a/flopy/mf6/modflow/mfgwtist.py b/flopy/mf6/modflow/mfgwtist.py index 2fdf33134e..ac9069eced 100644 --- a/flopy/mf6/modflow/mfgwtist.py +++ b/flopy/mf6/modflow/mfgwtist.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowGwtist(mfpackage.MFPackage): diff --git a/flopy/mf6/modflow/mfsimulation.py b/flopy/mf6/modflow/mfsimulation.py index 4877597d6e..dc6eb178be 100644 --- a/flopy/mf6/modflow/mfsimulation.py +++ b/flopy/mf6/modflow/mfsimulation.py @@ -1,25 +1,26 @@ import errno -import sys import inspect import os.path +import sys + import numpy as np + from ...mbase import run_model +from ..data import mfstructure +from ..data.mfdatautil import MFComment +from ..data.mfstructure import DatumType from ..mfbase import ( - PackageContainer, - MFFileMgmt, ExtFileAction, - PackageContainerType, - MFDataException, FlopyException, + MFDataException, + MFFileMgmt, + PackageContainer, + PackageContainerType, VerbosityLevel, ) from ..mfpackage import MFPackage -from ..data.mfstructure import DatumType -from ..data import mfstructure -from ..utils import binaryfile_utils -from ..utils import mfobservation -from ..modflow import mfnam, mfims, mftdis, mfgwfgnc, mfgwfmvr -from ..data.mfdatautil import MFComment +from ..modflow import mfgwfgnc, mfgwfmvr, mfims, mfnam, mftdis +from ..utils import binaryfile_utils, mfobservation class SimulationDict(dict): diff --git a/flopy/mf6/modflow/mfutlspca.py b/flopy/mf6/modflow/mfutlspca.py index c8799cc385..27f7a2fd0a 100644 --- a/flopy/mf6/modflow/mfutlspca.py +++ b/flopy/mf6/modflow/mfutlspca.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowUtlspca(mfpackage.MFPackage): diff --git a/flopy/mf6/modflow/mfutltas.py b/flopy/mf6/modflow/mfutltas.py index 8d606c1807..fcd076538a 100644 --- a/flopy/mf6/modflow/mfutltas.py +++ b/flopy/mf6/modflow/mfutltas.py @@ -2,7 +2,7 @@ # mf6/utils/createpackages.py # FILE created on December 22, 2021 17:36:26 UTC from .. import mfpackage -from ..data.mfdatautil import ListTemplateGenerator, ArrayTemplateGenerator +from ..data.mfdatautil import ArrayTemplateGenerator, ListTemplateGenerator class ModflowUtltas(mfpackage.MFPackage): diff --git a/flopy/mf6/utils/__init__.py b/flopy/mf6/utils/__init__.py index 984a79e49a..0a29d08f72 100644 --- a/flopy/mf6/utils/__init__.py +++ b/flopy/mf6/utils/__init__.py @@ -1,6 +1,5 @@ -# imports from . import createpackages -from .generate_classes import generate_classes from .binarygrid_util import MfGrdFile -from .postprocessing import get_structured_faceflows, get_residuals +from .generate_classes import generate_classes from .lakpak_utils import get_lak_connections +from .postprocessing import get_residuals, get_structured_faceflows diff --git a/flopy/mf6/utils/binaryfile_utils.py b/flopy/mf6/utils/binaryfile_utils.py index 2b222259c9..7ed85ed080 100644 --- a/flopy/mf6/utils/binaryfile_utils.py +++ b/flopy/mf6/utils/binaryfile_utils.py @@ -1,5 +1,7 @@ import os + import numpy as np + from ...utils import binaryfile as bf from ...utils import import_optional_dependency diff --git a/flopy/mf6/utils/binarygrid_util.py b/flopy/mf6/utils/binarygrid_util.py index 2b498ab226..fc686e3c1b 100644 --- a/flopy/mf6/utils/binarygrid_util.py +++ b/flopy/mf6/utils/binarygrid_util.py @@ -5,10 +5,11 @@ """ +import warnings + import numpy as np from ...utils.utils_def import FlopyBinaryData -import warnings warnings.simplefilter("always", DeprecationWarning) @@ -176,8 +177,8 @@ def __set_modelgrid(self): modelgrid : grid """ from ...discretization.structuredgrid import StructuredGrid - from ...discretization.vertexgrid import VertexGrid from ...discretization.unstructuredgrid import UnstructuredGrid + from ...discretization.vertexgrid import VertexGrid modelgrid = None idomain = self.idomain diff --git a/flopy/mf6/utils/createpackages.py b/flopy/mf6/utils/createpackages.py index 3924255447..72721a78e1 100644 --- a/flopy/mf6/utils/createpackages.py +++ b/flopy/mf6/utils/createpackages.py @@ -1,11 +1,11 @@ -import os -import io import datetime +import io +import os import textwrap from enum import Enum # keep below as absolute imports -from flopy.mf6.data import mfstructure, mfdatautil +from flopy.mf6.data import mfdatautil, mfstructure from flopy.utils import datautil """ @@ -409,15 +409,15 @@ def create_packages(): "w", newline="\n", ) - init_file.write("# imports\n") - init_file.write("from .mfsimulation import MFSimulation\n") + init_file.write("from .mfsimulation import MFSimulation # isort:skip\n") nam_import_string = ( "from .. import mfmodel\nfrom ..data.mfdatautil " - "import ListTemplateGenerator, ArrayTemplateGenerator" + "import ArrayTemplateGenerator, ListTemplateGenerator" ) # loop through packages list + init_file_imports = [] for package in package_list: data_structure_dict = {} package_properties = [] @@ -565,14 +565,8 @@ def create_packages(): import_string = "from .. import mfpackage" if template_gens: - import_string = f"{import_string}\nfrom ..data.mfdatautil import " - first_string = True - for template in template_gens: - if first_string: - import_string = f"{import_string}{template}" - first_string = False - else: - import_string = f"{import_string}, {template}" + import_string += "\nfrom ..data.mfdatautil import " + import_string += ", ".join(sorted(template_gens)) # add extra docstrings for additional variables doc_string.add_parameter( " filename : String\n File name for this package." @@ -769,7 +763,7 @@ def create_packages(): pb_file.write(packages_str) pb_file.close() - init_file.write( + init_file_imports.append( f"from .mf{package_name} import Modflow{package_name.title()}\n" ) @@ -844,9 +838,12 @@ def create_packages(): ) md_file.write(package_string) md_file.close() - init_file.write( + init_file_imports.append( f"from .mf{model_name} import Modflow{model_name.capitalize()}\n" ) + # Sort the imports + for line in sorted(init_file_imports, key=lambda x: x.split()[3]): + init_file.write(line) init_file.close() diff --git a/flopy/mf6/utils/generate_classes.py b/flopy/mf6/utils/generate_classes.py index e21780a449..622b929176 100644 --- a/flopy/mf6/utils/generate_classes.py +++ b/flopy/mf6/utils/generate_classes.py @@ -1,10 +1,9 @@ -import sys import os -import tempfile import shutil +import tempfile import time -from .createpackages import create_packages +from .createpackages import create_packages thisfilepath = os.path.dirname(os.path.abspath(__file__)) flopypth = os.path.join(thisfilepath, "..", "..") diff --git a/flopy/mf6/utils/mfobservation.py b/flopy/mf6/utils/mfobservation.py index 0c19054141..ab3fe30c3f 100644 --- a/flopy/mf6/utils/mfobservation.py +++ b/flopy/mf6/utils/mfobservation.py @@ -1,6 +1,7 @@ -import numpy as np import csv +import numpy as np + from ...utils import import_optional_dependency diff --git a/flopy/mf6/utils/output_util.py b/flopy/mf6/utils/output_util.py index 6424c17432..ec6e8d0fba 100644 --- a/flopy/mf6/utils/output_util.py +++ b/flopy/mf6/utils/output_util.py @@ -1,15 +1,16 @@ import os + +from ...mbase import ModelInterface +from ...pakbase import PackageInterface from ...utils import ( - HeadFile, CellBudgetFile, + HeadFile, + Mf6ListBudget, Mf6Obs, ZoneBudget6, ZoneFile6, - Mf6ListBudget, ) from ...utils.observationfile import CsvFile -from ...pakbase import PackageInterface -from ...mbase import ModelInterface class MF6Output: @@ -24,7 +25,7 @@ class MF6Output: """ def __init__(self, obj): - from ..modflow import ModflowUtlobs, ModflowGwtoc, ModflowGwfoc + from ..modflow import ModflowGwfoc, ModflowGwtoc, ModflowUtlobs # set initial observation definitions methods = { diff --git a/flopy/mf6/utils/postprocessing.py b/flopy/mf6/utils/postprocessing.py index 2122f79d66..43fc364284 100644 --- a/flopy/mf6/utils/postprocessing.py +++ b/flopy/mf6/utils/postprocessing.py @@ -1,4 +1,5 @@ import numpy as np + from .binarygrid_util import MfGrdFile diff --git a/flopy/mfusg/__init__.py b/flopy/mfusg/__init__.py index 152d2212c8..5bd255e44c 100644 --- a/flopy/mfusg/__init__.py +++ b/flopy/mfusg/__init__.py @@ -1,13 +1,13 @@ """Initialize MfUsg.""" +from .cln_dtypes import MfUsgClnDtypes from .mfusg import MfUsg -from .mfusgdisu import MfUsgDisU from .mfusgbcf import MfUsgBcf -from .mfusglpf import MfUsgLpf -from .mfusgwel import MfUsgWel from .mfusgcln import MfUsgCln -from .cln_dtypes import MfUsgClnDtypes -from .mfusgsms import MfUsgSms +from .mfusgdisu import MfUsgDisU from .mfusggnc import MfUsgGnc +from .mfusglpf import MfUsgLpf +from .mfusgsms import MfUsgSms +from .mfusgwel import MfUsgWel __all__ = [ "MfUsg", diff --git a/flopy/mfusg/mfusg.py b/flopy/mfusg/mfusg.py index 751aa23b5f..e4652f1af1 100644 --- a/flopy/mfusg/mfusg.py +++ b/flopy/mfusg/mfusg.py @@ -1,11 +1,12 @@ """Mfusg module.""" import os from inspect import getfullargspec + import flopy -from ..utils import mfreadnam -from ..modflow import Modflow from ..mbase import PackageLoadException +from ..modflow import Modflow +from ..utils import mfreadnam class MfUsg(Modflow): diff --git a/flopy/mfusg/mfusgbcf.py b/flopy/mfusg/mfusgbcf.py index 62a1d51320..788feb4f23 100644 --- a/flopy/mfusg/mfusgbcf.py +++ b/flopy/mfusg/mfusgbcf.py @@ -7,15 +7,15 @@ import numpy as np from ..modflow import ModflowBcf -from .mfusg import MfUsg from ..utils import Util2d, Util3d from ..utils.flopy_io import line_parse from ..utils.utils_def import ( - get_util2d_shape_for_layer, + get_open_file_object, get_unitnumber_from_ext_unit_dict, + get_util2d_shape_for_layer, type_from_iterable, - get_open_file_object, ) +from .mfusg import MfUsg class MfUsgBcf(ModflowBcf): diff --git a/flopy/mfusg/mfusgcln.py b/flopy/mfusg/mfusgcln.py index c0570e2ac5..023f58399b 100644 --- a/flopy/mfusg/mfusgcln.py +++ b/flopy/mfusg/mfusgcln.py @@ -21,11 +21,11 @@ """ import numpy as np -from .cln_dtypes import MfUsgClnDtypes -from .mfusg import fmt_string, MfUsg from ..pakbase import Package from ..utils import Util2d from ..utils.utils_def import get_open_file_object +from .cln_dtypes import MfUsgClnDtypes +from .mfusg import MfUsg, fmt_string class MfUsgCln(Package): diff --git a/flopy/mfusg/mfusgdisu.py b/flopy/mfusg/mfusgdisu.py index c81643aa0c..bbd85ccf03 100644 --- a/flopy/mfusg/mfusgdisu.py +++ b/flopy/mfusg/mfusgdisu.py @@ -4,11 +4,11 @@ """ import numpy as np -from .mfusg import MfUsg +from ..discretization.unstructuredgrid import UnstructuredGrid from ..pakbase import Package from ..utils import Util2d, Util3d, read1d from ..utils.reference import TemporalReference -from ..discretization.unstructuredgrid import UnstructuredGrid +from .mfusg import MfUsg ITMUNI = {"u": 0, "s": 1, "m": 2, "h": 3, "d": 4, "y": 5} LENUNI = {"u": 0, "f": 1, "m": 2, "c": 3} diff --git a/flopy/mfusg/mfusggnc.py b/flopy/mfusg/mfusggnc.py index da8b6edb69..a4e81cd686 100644 --- a/flopy/mfusg/mfusggnc.py +++ b/flopy/mfusg/mfusggnc.py @@ -6,12 +6,12 @@ the MfUsgGnc class as `flopy.mfusg.MfUsgGnc`. """ import numpy as np + +from ..modflow.mfparbc import ModflowParBc as mfparbc from ..pakbase import Package -from ..utils.recarray_utils import create_empty_recarray from ..utils.flopy_io import ulstrd -from ..modflow.mfparbc import ModflowParBc as mfparbc -from .mfusg import MfUsg -from .mfusg import fmt_string +from ..utils.recarray_utils import create_empty_recarray +from .mfusg import MfUsg, fmt_string class MfUsgGnc(Package): diff --git a/flopy/mfusg/mfusglpf.py b/flopy/mfusg/mfusglpf.py index 368989a056..bf1766e9b9 100644 --- a/flopy/mfusg/mfusglpf.py +++ b/flopy/mfusg/mfusglpf.py @@ -10,16 +10,16 @@ """ import numpy as np -from ..modflow.mfpar import ModflowPar as mfpar from ..modflow.mflpf import ModflowLpf -from .mfusg import MfUsg +from ..modflow.mfpar import ModflowPar as mfpar from ..utils import Util2d, read1d from ..utils.flopy_io import line_parse from ..utils.utils_def import ( - get_util2d_shape_for_layer, - get_unitnumber_from_ext_unit_dict, get_open_file_object, + get_unitnumber_from_ext_unit_dict, + get_util2d_shape_for_layer, ) +from .mfusg import MfUsg class MfUsgLpf(ModflowLpf): diff --git a/flopy/mfusg/mfusgwel.py b/flopy/mfusg/mfusgwel.py index 3d6c6074d3..633a741de6 100644 --- a/flopy/mfusg/mfusgwel.py +++ b/flopy/mfusg/mfusgwel.py @@ -9,15 +9,16 @@ `_. """ from copy import deepcopy + import numpy as np from numpy.lib.recfunctions import stack_arrays -from .mfusg import MfUsg -from ..modflow.mfwel import ModflowWel from ..modflow.mfparbc import ModflowParBc as mfparbc -from ..utils.flopy_io import ulstrd +from ..modflow.mfwel import ModflowWel from ..utils import MfList +from ..utils.flopy_io import ulstrd from ..utils.utils_def import get_open_file_object +from .mfusg import MfUsg class MfUsgWel(ModflowWel): diff --git a/flopy/modflow/__init__.py b/flopy/modflow/__init__.py index dec5bab063..53283dae23 100644 --- a/flopy/modflow/__init__.py +++ b/flopy/modflow/__init__.py @@ -1,48 +1,48 @@ from .mf import Modflow +from .mfaddoutsidefile import mfaddoutsidefile from .mfag import ModflowAg from .mfbas import ModflowBas from .mfbcf import ModflowBcf -from .mflpf import ModflowLpf from .mfchd import ModflowChd -from .mffhb import ModflowFhb +from .mfde4 import ModflowDe4 from .mfdis import ModflowDis from .mfdrn import ModflowDrn from .mfdrt import ModflowDrt from .mfevt import ModflowEvt +from .mffhb import ModflowFhb +from .mfflwob import ModflowFlwob +from .mfgage import ModflowGage from .mfghb import ModflowGhb +from .mfgmg import ModflowGmg +from .mfhfb import ModflowHfb +from .mfhob import HeadObservation, ModflowHob +from .mfhyd import ModflowHyd +from .mflak import ModflowLak +from .mflmt import ModflowLmt +from .mflpf import ModflowLpf +from .mfmlt import ModflowMlt +from .mfmnw1 import ModflowMnw1 +from .mfmnw2 import Mnw, ModflowMnw2 +from .mfmnwi import ModflowMnwi +from .mfnwt import ModflowNwt +from .mfoc import ModflowOc +from .mfparbc import ModflowParBc from .mfpbc import ModflowPbc +from .mfpcg import ModflowPcg +from .mfpcgn import ModflowPcgn +from .mfpks import ModflowPks +from .mfpval import ModflowPval from .mfrch import ModflowRch from .mfriv import ModflowRiv -from .mfstr import ModflowStr -from .mfwel import ModflowWel -from .mfpval import ModflowPval -from .mfoc import ModflowOc +from .mfsfr2 import ModflowSfr2 from .mfsip import ModflowSip from .mfsor import ModflowSor -from .mfswr1 import ModflowSwr1 +from .mfstr import ModflowStr +from .mfsub import ModflowSub from .mfswi2 import ModflowSwi2 -from .mfpcg import ModflowPcg -from .mfpcgn import ModflowPcgn -from .mfde4 import ModflowDe4 -from .mfpks import ModflowPks -from .mflmt import ModflowLmt -from .mfuzf1 import ModflowUzf1 +from .mfswr1 import ModflowSwr1 +from .mfswt import ModflowSwt from .mfupw import ModflowUpw -from .mfnwt import ModflowNwt -from .mfmnw1 import ModflowMnw1 -from .mfmnw2 import ModflowMnw2, Mnw -from .mfmnwi import ModflowMnwi +from .mfuzf1 import ModflowUzf1 +from .mfwel import ModflowWel from .mfzon import ModflowZon -from .mfmlt import ModflowMlt -from .mfparbc import ModflowParBc -from .mfgmg import ModflowGmg -from .mfhfb import ModflowHfb -from .mfsfr2 import ModflowSfr2 -from .mflak import ModflowLak -from .mfgage import ModflowGage -from .mfsub import ModflowSub -from .mfswt import ModflowSwt -from .mfhyd import ModflowHyd -from .mfhob import ModflowHob, HeadObservation -from .mfflwob import ModflowFlwob -from .mfaddoutsidefile import mfaddoutsidefile diff --git a/flopy/modflow/mf.py b/flopy/modflow/mf.py index f5f4bc13f8..d8f574e729 100644 --- a/flopy/modflow/mf.py +++ b/flopy/modflow/mf.py @@ -5,16 +5,17 @@ """ import os -import flopy import warnings from inspect import getfullargspec + +import flopy + +from ..discretization.modeltime import ModelTime +from ..discretization.structuredgrid import StructuredGrid +from ..discretization.unstructuredgrid import UnstructuredGrid from ..mbase import BaseModel from ..pakbase import Package from ..utils import mfreadnam -from ..discretization.structuredgrid import StructuredGrid -from ..discretization.unstructuredgrid import UnstructuredGrid -from ..discretization.grid import Grid -from ..discretization.modeltime import ModelTime from .mfpar import ModflowPar diff --git a/flopy/modflow/mfaddoutsidefile.py b/flopy/modflow/mfaddoutsidefile.py index a5cbcd7b01..b9935cd24f 100644 --- a/flopy/modflow/mfaddoutsidefile.py +++ b/flopy/modflow/mfaddoutsidefile.py @@ -1,4 +1,3 @@ -from numpy import atleast_2d from ..pakbase import Package diff --git a/flopy/modflow/mfag.py b/flopy/modflow/mfag.py index d4a7ae24f8..5eae021880 100644 --- a/flopy/modflow/mfag.py +++ b/flopy/modflow/mfag.py @@ -9,11 +9,13 @@ """ import os + import numpy as np -from ..utils.flopy_io import multi_line_strip + from ..pakbase import Package -from ..utils.recarray_utils import create_empty_recarray +from ..utils.flopy_io import multi_line_strip from ..utils.optionblock import OptionBlock +from ..utils.recarray_utils import create_empty_recarray class ModflowAg(Package): diff --git a/flopy/modflow/mfbas.py b/flopy/modflow/mfbas.py index 6a54c87a01..4c15679e34 100644 --- a/flopy/modflow/mfbas.py +++ b/flopy/modflow/mfbas.py @@ -9,7 +9,9 @@ """ import re + import numpy as np + from ..pakbase import Package from ..utils import Util3d diff --git a/flopy/modflow/mfbct.py b/flopy/modflow/mfbct.py index 73223e0d78..45c9493163 100644 --- a/flopy/modflow/mfbct.py +++ b/flopy/modflow/mfbct.py @@ -1,4 +1,5 @@ import numpy as np + from ..pakbase import Package from ..utils import Util2d, Util3d diff --git a/flopy/modflow/mfchd.py b/flopy/modflow/mfchd.py index 74ba5a1927..71ece6dd28 100644 --- a/flopy/modflow/mfchd.py +++ b/flopy/modflow/mfchd.py @@ -9,6 +9,7 @@ """ import numpy as np + from ..pakbase import Package from ..utils import MfList from ..utils.recarray_utils import create_empty_recarray diff --git a/flopy/modflow/mfdis.py b/flopy/modflow/mfdis.py index 19d96ba9b6..836d0fc313 100644 --- a/flopy/modflow/mfdis.py +++ b/flopy/modflow/mfdis.py @@ -13,8 +13,8 @@ from ..pakbase import Package from ..utils import Util2d, Util3d -from ..utils.reference import TemporalReference from ..utils.flopy_io import line_parse +from ..utils.reference import TemporalReference ITMUNI = {"u": 0, "s": 1, "m": 2, "h": 3, "d": 4, "y": 5} LENUNI = {"u": 0, "f": 1, "m": 2, "c": 3} diff --git a/flopy/modflow/mfdrn.py b/flopy/modflow/mfdrn.py index 0c0bd5b083..32f6e7992b 100644 --- a/flopy/modflow/mfdrn.py +++ b/flopy/modflow/mfdrn.py @@ -8,9 +8,10 @@ """ import numpy as np + from ..pakbase import Package -from ..utils.util_list import MfList from ..utils.recarray_utils import create_empty_recarray +from ..utils.util_list import MfList class ModflowDrn(Package): diff --git a/flopy/modflow/mfdrt.py b/flopy/modflow/mfdrt.py index dc339af35f..688fb385fa 100644 --- a/flopy/modflow/mfdrt.py +++ b/flopy/modflow/mfdrt.py @@ -8,9 +8,10 @@ """ import numpy as np + from ..pakbase import Package -from ..utils.util_list import MfList from ..utils.recarray_utils import create_empty_recarray +from ..utils.util_list import MfList class ModflowDrt(Package): diff --git a/flopy/modflow/mfevt.py b/flopy/modflow/mfevt.py index 1ab8c05875..a8409451cb 100644 --- a/flopy/modflow/mfevt.py +++ b/flopy/modflow/mfevt.py @@ -8,11 +8,11 @@ """ import numpy as np -from .mfparbc import ModflowParBc as mfparbc -from ..utils import Transient2d, Util2d -from ..utils.utils_def import get_pak_vals_shape from ..pakbase import Package +from ..utils import Transient2d, Util2d +from ..utils.utils_def import get_pak_vals_shape +from .mfparbc import ModflowParBc as mfparbc class ModflowEvt(Package): diff --git a/flopy/modflow/mffhb.py b/flopy/modflow/mffhb.py index b961d8d418..60b49aac68 100644 --- a/flopy/modflow/mffhb.py +++ b/flopy/modflow/mffhb.py @@ -10,8 +10,8 @@ import numpy as np from ..pakbase import Package -from ..utils.recarray_utils import create_empty_recarray from ..utils import read1d +from ..utils.recarray_utils import create_empty_recarray class ModflowFhb(Package): diff --git a/flopy/modflow/mfflwob.py b/flopy/modflow/mfflwob.py index 7c64a4bfe7..6c9962a0f9 100755 --- a/flopy/modflow/mfflwob.py +++ b/flopy/modflow/mfflwob.py @@ -1,5 +1,7 @@ import os + import numpy as np + from ..pakbase import Package from ..utils import parsenamefile diff --git a/flopy/modflow/mfghb.py b/flopy/modflow/mfghb.py index 019aceb728..b1416d3998 100644 --- a/flopy/modflow/mfghb.py +++ b/flopy/modflow/mfghb.py @@ -8,6 +8,7 @@ """ import numpy as np + from ..pakbase import Package from ..utils import MfList from ..utils.recarray_utils import create_empty_recarray diff --git a/flopy/modflow/mfhfb.py b/flopy/modflow/mfhfb.py index c9cf3d5cf9..bc35ad3f81 100644 --- a/flopy/modflow/mfhfb.py +++ b/flopy/modflow/mfhfb.py @@ -8,11 +8,12 @@ """ import numpy as np -from ..pakbase import Package -from .mfparbc import ModflowParBc as mfparbc from numpy.lib.recfunctions import stack_arrays + +from ..pakbase import Package from ..utils.flopy_io import line_parse from ..utils.recarray_utils import create_empty_recarray +from .mfparbc import ModflowParBc as mfparbc class ModflowHfb(Package): diff --git a/flopy/modflow/mfhob.py b/flopy/modflow/mfhob.py index b4e1de3d7c..0e570c4acc 100755 --- a/flopy/modflow/mfhob.py +++ b/flopy/modflow/mfhob.py @@ -1,4 +1,5 @@ import numpy as np + from ..pakbase import Package from ..utils.recarray_utils import create_empty_recarray diff --git a/flopy/modflow/mflak.py b/flopy/modflow/mflak.py index 7462759c13..4231f21cb0 100644 --- a/flopy/modflow/mflak.py +++ b/flopy/modflow/mflak.py @@ -8,9 +8,10 @@ """ import numpy as np + from ..pakbase import Package -from ..utils.util_array import Transient3d from ..utils import Util3d, read_fixed_var, write_fixed_var +from ..utils.util_array import Transient3d class ModflowLak(Package): diff --git a/flopy/modflow/mflpf.py b/flopy/modflow/mflpf.py index 6586f5af6e..5810a1d586 100644 --- a/flopy/modflow/mflpf.py +++ b/flopy/modflow/mflpf.py @@ -8,11 +8,11 @@ """ import numpy as np -from .mfpar import ModflowPar as mfpar from ..pakbase import Package from ..utils import Util2d, Util3d, read1d from ..utils.flopy_io import line_parse +from .mfpar import ModflowPar as mfpar class ModflowLpf(Package): diff --git a/flopy/modflow/mfmnw1.py b/flopy/modflow/mfmnw1.py index d72b424a08..0c2eb0eba2 100644 --- a/flopy/modflow/mfmnw1.py +++ b/flopy/modflow/mfmnw1.py @@ -1,8 +1,10 @@ import re + import numpy as np + from ..pakbase import Package -from ..utils.flopy_io import line_parse, pop_item from ..utils import MfList +from ..utils.flopy_io import line_parse, pop_item from ..utils.recarray_utils import create_empty_recarray, recarray diff --git a/flopy/modflow/mfmnw2.py b/flopy/modflow/mfmnw2.py index 9e23d30119..239457ba21 100644 --- a/flopy/modflow/mfmnw2.py +++ b/flopy/modflow/mfmnw2.py @@ -2,13 +2,12 @@ import warnings import numpy as np -from .mfdis import get_layer -from ..utils import check -from ..utils.flopy_io import line_parse, pop_item, get_next_line -from ..utils import MfList -from ..utils.recarray_utils import create_empty_recarray from ..pakbase import Package +from ..utils import MfList, check +from ..utils.flopy_io import get_next_line, line_parse, pop_item +from ..utils.recarray_utils import create_empty_recarray +from .mfdis import get_layer class Mnw: diff --git a/flopy/modflow/mfmnwi.py b/flopy/modflow/mfmnwi.py index f1ddd14135..6b6c03548b 100644 --- a/flopy/modflow/mfmnwi.py +++ b/flopy/modflow/mfmnwi.py @@ -1,5 +1,5 @@ -from ..utils.flopy_io import line_parse, pop_item from ..pakbase import Package +from ..utils.flopy_io import line_parse, pop_item class ModflowMnwi(Package): diff --git a/flopy/modflow/mfpar.py b/flopy/modflow/mfpar.py index b7e15e0bb4..331bc9657f 100644 --- a/flopy/modflow/mfpar.py +++ b/flopy/modflow/mfpar.py @@ -5,9 +5,10 @@ """ import numpy as np -from .mfzon import ModflowZon -from .mfpval import ModflowPval + from .mfmlt import ModflowMlt +from .mfpval import ModflowPval +from .mfzon import ModflowZon class ModflowPar: diff --git a/flopy/modflow/mfparbc.py b/flopy/modflow/mfparbc.py index 87671f9abf..a94e070c71 100644 --- a/flopy/modflow/mfparbc.py +++ b/flopy/modflow/mfparbc.py @@ -5,6 +5,7 @@ """ import numpy as np + from ..utils.flopy_io import line_strip, ulstrd diff --git a/flopy/modflow/mfrch.py b/flopy/modflow/mfrch.py index 5640ae1762..07f41f7c84 100644 --- a/flopy/modflow/mfrch.py +++ b/flopy/modflow/mfrch.py @@ -8,9 +8,10 @@ """ import numpy as np -from ..pakbase import Package -from ..utils import Util2d, Transient2d + from ..modflow.mfparbc import ModflowParBc as mfparbc +from ..pakbase import Package +from ..utils import Transient2d, Util2d from ..utils.flopy_io import line_parse from ..utils.utils_def import get_pak_vals_shape diff --git a/flopy/modflow/mfriv.py b/flopy/modflow/mfriv.py index a86117e018..db88c6e225 100644 --- a/flopy/modflow/mfriv.py +++ b/flopy/modflow/mfriv.py @@ -8,6 +8,7 @@ """ import numpy as np + from ..pakbase import Package from ..utils import MfList from ..utils.recarray_utils import create_empty_recarray diff --git a/flopy/modflow/mfsfr2.py b/flopy/modflow/mfsfr2.py index afbc6f623a..50a613057d 100644 --- a/flopy/modflow/mfsfr2.py +++ b/flopy/modflow/mfsfr2.py @@ -1,16 +1,17 @@ __author__ = "aleaf" +import copy import os -import numpy as np import warnings -import copy + +import numpy as np from numpy.lib import recfunctions + from ..pakbase import Package -from ..utils import MfList +from ..utils import MfList, import_optional_dependency from ..utils.flopy_io import line_parse -from ..utils.recarray_utils import create_empty_recarray from ..utils.optionblock import OptionBlock -from ..utils import import_optional_dependency +from ..utils.recarray_utils import create_empty_recarray class ModflowSfr2(Package): @@ -2061,8 +2062,8 @@ def write_file(self, filename=None): def export(self, f, **kwargs): if isinstance(f, str) and f.lower().endswith(".shp"): - from ..utils.geometry import Polygon from ..export.shapefile_utils import recarray2shp + from ..utils.geometry import Polygon geoms = [] for ix, i in enumerate(self.reach_data.i): @@ -2083,8 +2084,8 @@ def export_linkages(self, f, **kwargs): reaches can be used to filter for the longest connections in a GIS. """ - from ..utils.geometry import LineString from ..export.shapefile_utils import recarray2shp + from ..utils.geometry import LineString rd = self.reach_data.copy() m = self.parent @@ -2126,8 +2127,8 @@ def export_outlets(self, f, **kwargs): the model (outset=0). """ - from ..utils.geometry import Point from ..export.shapefile_utils import recarray2shp + from ..utils.geometry import Point rd = self.reach_data if np.min(rd.outreach) == np.max(rd.outreach): @@ -2160,8 +2161,8 @@ def export_transient_variable(self, f, varname, **kwargs): Variable in SFR Package dataset 6a (see SFR package documentation) """ - from ..utils.geometry import Point from ..export.shapefile_utils import recarray2shp + from ..utils.geometry import Point rd = self.reach_data if np.min(rd.outreach) == np.max(rd.outreach): diff --git a/flopy/modflow/mfstr.py b/flopy/modflow/mfstr.py index 503cbe454d..3e179f70db 100644 --- a/flopy/modflow/mfstr.py +++ b/flopy/modflow/mfstr.py @@ -8,11 +8,11 @@ """ import numpy as np -from ..utils import MfList + from ..pakbase import Package -from .mfparbc import ModflowParBc as mfparbc +from ..utils import MfList, read_fixed_var, write_fixed_var from ..utils.recarray_utils import create_empty_recarray -from ..utils import read_fixed_var, write_fixed_var +from .mfparbc import ModflowParBc as mfparbc class ModflowStr(Package): diff --git a/flopy/modflow/mfupw.py b/flopy/modflow/mfupw.py index b606097386..cfed196ab2 100644 --- a/flopy/modflow/mfupw.py +++ b/flopy/modflow/mfupw.py @@ -8,10 +8,11 @@ """ import numpy as np -from .mfpar import ModflowPar as mfpar + from ..pakbase import Package from ..utils import Util2d, Util3d, read1d from ..utils.flopy_io import line_parse +from .mfpar import ModflowPar as mfpar class ModflowUpw(Package): diff --git a/flopy/modflow/mfuzf1.py b/flopy/modflow/mfuzf1.py index dc009f0113..4975e6c500 100644 --- a/flopy/modflow/mfuzf1.py +++ b/flopy/modflow/mfuzf1.py @@ -7,12 +7,14 @@ `_. """ +import warnings + import numpy as np -from ..utils.flopy_io import pop_item, line_parse, multi_line_strip + from ..pakbase import Package -from ..utils import Util2d, Transient2d +from ..utils import Transient2d, Util2d +from ..utils.flopy_io import line_parse, multi_line_strip, pop_item from ..utils.optionblock import OptionBlock -import warnings class ModflowUzf1(Package): diff --git a/flopy/modflow/mfwel.py b/flopy/modflow/mfwel.py index 0328b59bc4..786a41ff31 100644 --- a/flopy/modflow/mfwel.py +++ b/flopy/modflow/mfwel.py @@ -8,11 +8,11 @@ """ import numpy as np -from ..utils import MfList + from ..pakbase import Package -from ..utils.recarray_utils import create_empty_recarray +from ..utils import MfList from ..utils.optionblock import OptionBlock -import warnings +from ..utils.recarray_utils import create_empty_recarray class ModflowWel(Package): diff --git a/flopy/modflow/mfzon.py b/flopy/modflow/mfzon.py index 26e7637c7c..23e3c9c1ec 100644 --- a/flopy/modflow/mfzon.py +++ b/flopy/modflow/mfzon.py @@ -8,6 +8,7 @@ """ import numpy as np + from ..pakbase import Package from ..utils import Util2d diff --git a/flopy/modflowlgr/__init__.py b/flopy/modflowlgr/__init__.py index 5740d82d1a..17f6000091 100644 --- a/flopy/modflowlgr/__init__.py +++ b/flopy/modflowlgr/__init__.py @@ -1 +1 @@ -from .mflgr import ModflowLgr, LgrChild +from .mflgr import LgrChild, ModflowLgr diff --git a/flopy/modpath/__init__.py b/flopy/modpath/__init__.py index efcf689820..c394139833 100644 --- a/flopy/modpath/__init__.py +++ b/flopy/modpath/__init__.py @@ -3,16 +3,16 @@ from .mp6sim import Modpath6Sim from .mp7 import Modpath7 from .mp7bas import Modpath7Bas -from .mp7sim import Modpath7Sim -from .mp7particlegroup import ( - ParticleGroup, - ParticleGroupLRCTemplate, - ParticleGroupNodeTemplate, -) from .mp7particledata import ( - ParticleData, - FaceDataType, CellDataType, + FaceDataType, LRCParticleData, NodeParticleData, + ParticleData, +) +from .mp7particlegroup import ( + ParticleGroup, + ParticleGroupLRCTemplate, + ParticleGroupNodeTemplate, ) +from .mp7sim import Modpath7Sim diff --git a/flopy/modpath/mp6.py b/flopy/modpath/mp6.py index 474e238a48..87e177fb8d 100644 --- a/flopy/modpath/mp6.py +++ b/flopy/modpath/mp6.py @@ -1,8 +1,10 @@ +import os + import numpy as np + from ..mbase import BaseModel from ..pakbase import Package from .mp6sim import Modpath6Sim -import os class Modpath6List(Package): diff --git a/flopy/modpath/mp6bas.py b/flopy/modpath/mp6bas.py index 4e38187a76..aca8bc1cdc 100644 --- a/flopy/modpath/mp6bas.py +++ b/flopy/modpath/mp6bas.py @@ -8,6 +8,7 @@ """ import numpy as np + from ..pakbase import Package from ..utils import Util2d, Util3d diff --git a/flopy/modpath/mp6sim.py b/flopy/modpath/mp6sim.py index ea0bdeed53..f6fcf918c6 100644 --- a/flopy/modpath/mp6sim.py +++ b/flopy/modpath/mp6sim.py @@ -8,6 +8,7 @@ """ import numpy as np + from ..pakbase import Package from ..utils import Util3d diff --git a/flopy/modpath/mp7.py b/flopy/modpath/mp7.py index 5848d3566c..63c0e159b9 100644 --- a/flopy/modpath/mp7.py +++ b/flopy/modpath/mp7.py @@ -1,19 +1,20 @@ """ mp7 module. Contains the Modpath7List and Modpath7 classes. - """ +import os + import numpy as np + from ..mbase import BaseModel -from ..modflow import Modflow from ..mf6 import MFModel +from ..modflow import Modflow from ..pakbase import Package from .mp7bas import Modpath7Bas -from .mp7sim import Modpath7Sim from .mp7particledata import CellDataType, NodeParticleData from .mp7particlegroup import ParticleGroupNodeTemplate -import os +from .mp7sim import Modpath7Sim class Modpath7List(Package): diff --git a/flopy/modpath/mp7bas.py b/flopy/modpath/mp7bas.py index 07337263ba..e9f8344aaf 100644 --- a/flopy/modpath/mp7bas.py +++ b/flopy/modpath/mp7bas.py @@ -3,6 +3,7 @@ """ import numpy as np + from ..pakbase import Package from ..utils import Util2d, Util3d diff --git a/flopy/modpath/mp7particledata.py b/flopy/modpath/mp7particledata.py index d63c666461..db769df698 100644 --- a/flopy/modpath/mp7particledata.py +++ b/flopy/modpath/mp7particledata.py @@ -5,9 +5,8 @@ """ -import os import numpy as np -from ..utils.util_array import Util2d + from ..utils.recarray_utils import create_empty_recarray diff --git a/flopy/modpath/mp7particlegroup.py b/flopy/modpath/mp7particlegroup.py index cfa4dc159a..4490bf7966 100644 --- a/flopy/modpath/mp7particlegroup.py +++ b/flopy/modpath/mp7particlegroup.py @@ -6,9 +6,11 @@ """ import os + import numpy as np + from ..utils.util_array import Util2d -from .mp7particledata import ParticleData, NodeParticleData +from .mp7particledata import NodeParticleData, ParticleData class _Modpath7ParticleGroup: diff --git a/flopy/modpath/mp7sim.py b/flopy/modpath/mp7sim.py index 1888bad755..056f7ad244 100644 --- a/flopy/modpath/mp7sim.py +++ b/flopy/modpath/mp7sim.py @@ -8,7 +8,9 @@ """ from enum import Enum + import numpy as np + from ..pakbase import Package from ..utils import Util2d, Util3d from .mp7particlegroup import ( diff --git a/flopy/mt3d/__init__.py b/flopy/mt3d/__init__.py index c1dc03cd35..51b53c8175 100644 --- a/flopy/mt3d/__init__.py +++ b/flopy/mt3d/__init__.py @@ -3,10 +3,10 @@ from .mtbtn import Mt3dBtn from .mtdsp import Mt3dDsp from .mtgcg import Mt3dGcg +from .mtlkt import Mt3dLkt from .mtphc import Mt3dPhc from .mtrct import Mt3dRct +from .mtsft import Mt3dSft from .mtssm import Mt3dSsm from .mttob import Mt3dTob -from .mtlkt import Mt3dLkt -from .mtsft import Mt3dSft from .mtuzt import Mt3dUzt diff --git a/flopy/mt3d/mt.py b/flopy/mt3d/mt.py index 6a8b37dad8..342237090b 100644 --- a/flopy/mt3d/mt.py +++ b/flopy/mt3d/mt.py @@ -1,21 +1,23 @@ import os + import numpy as np + +from ..discretization.modeltime import ModelTime +from ..discretization.structuredgrid import StructuredGrid from ..mbase import BaseModel from ..pakbase import Package from ..utils import mfreadnam -from .mtbtn import Mt3dBtn from .mtadv import Mt3dAdv +from .mtbtn import Mt3dBtn from .mtdsp import Mt3dDsp -from .mtssm import Mt3dSsm -from .mtrct import Mt3dRct from .mtgcg import Mt3dGcg -from .mttob import Mt3dTob +from .mtlkt import Mt3dLkt from .mtphc import Mt3dPhc -from .mtuzt import Mt3dUzt +from .mtrct import Mt3dRct from .mtsft import Mt3dSft -from .mtlkt import Mt3dLkt -from ..discretization.structuredgrid import StructuredGrid -from ..discretization.modeltime import ModelTime +from .mtssm import Mt3dSsm +from .mttob import Mt3dTob +from .mtuzt import Mt3dUzt class Mt3dList(Package): diff --git a/flopy/mt3d/mtbtn.py b/flopy/mt3d/mtbtn.py index f9f154d4b7..0a9ea532e9 100644 --- a/flopy/mt3d/mtbtn.py +++ b/flopy/mt3d/mtbtn.py @@ -7,10 +7,12 @@ """ +import warnings + import numpy as np + from ..pakbase import Package from ..utils import Util2d, Util3d -import warnings class Mt3dBtn(Package): diff --git a/flopy/mt3d/mtdsp.py b/flopy/mt3d/mtdsp.py index e181cfec9c..5dcfe12d75 100644 --- a/flopy/mt3d/mtdsp.py +++ b/flopy/mt3d/mtdsp.py @@ -1,4 +1,5 @@ import numpy as np + from ..pakbase import Package from ..utils import Util2d, Util3d diff --git a/flopy/mt3d/mtlkt.py b/flopy/mt3d/mtlkt.py index aad9442d55..77bd9af040 100644 --- a/flopy/mt3d/mtlkt.py +++ b/flopy/mt3d/mtlkt.py @@ -1,7 +1,7 @@ import numpy as np from ..pakbase import Package -from ..utils import Util2d, MfList +from ..utils import MfList, Util2d __author__ = "emorway" diff --git a/flopy/mt3d/mtrct.py b/flopy/mt3d/mtrct.py index b7b4e1cdcf..24b419a486 100644 --- a/flopy/mt3d/mtrct.py +++ b/flopy/mt3d/mtrct.py @@ -1,4 +1,5 @@ import numpy as np + from ..pakbase import Package from ..utils import Util3d diff --git a/flopy/mt3d/mtsft.py b/flopy/mt3d/mtsft.py index c77d8394f7..a075920e12 100644 --- a/flopy/mt3d/mtsft.py +++ b/flopy/mt3d/mtsft.py @@ -1,7 +1,7 @@ import numpy as np from ..pakbase import Package -from ..utils import Util2d, MfList +from ..utils import MfList, Util2d __author__ = "emorway" diff --git a/flopy/mt3d/mtssm.py b/flopy/mt3d/mtssm.py index 76c94405c4..0ddc22997f 100644 --- a/flopy/mt3d/mtssm.py +++ b/flopy/mt3d/mtssm.py @@ -1,7 +1,9 @@ -import numpy as np import warnings + +import numpy as np + from ..pakbase import Package -from ..utils import Util2d, MfList, Transient2d +from ..utils import MfList, Transient2d, Util2d # Note: Order matters as first 6 need logical flag on line 1 of SSM file SsmLabels = ["WEL", "DRN", "RCH", "EVT", "RIV", "GHB", "BAS6", "CHD", "PBC"] diff --git a/flopy/mt3d/mtuzt.py b/flopy/mt3d/mtuzt.py index dcefcebcea..a6910629ed 100644 --- a/flopy/mt3d/mtuzt.py +++ b/flopy/mt3d/mtuzt.py @@ -3,7 +3,7 @@ import numpy as np from ..pakbase import Package -from ..utils import Util2d, Util3d, Transient2d +from ..utils import Transient2d, Util2d class Mt3dUzt(Package): diff --git a/flopy/pakbase.py b/flopy/pakbase.py index 65c74fd4f8..beaa0e527e 100644 --- a/flopy/pakbase.py +++ b/flopy/pakbase.py @@ -11,9 +11,7 @@ import numpy as np from numpy.lib.recfunctions import stack_arrays -from .modflow.mfparbc import ModflowParBc as mfparbc -from .utils import Util2d, Util3d, Transient2d, MfList, check -from .utils import OptionBlock +from .utils import MfList, OptionBlock, Transient2d, Util2d, Util3d, check from .utils.flopy_io import ulstrd @@ -889,6 +887,7 @@ def load(f, model, pak_type, ext_unit_dict=None, **kwargs): Default load method for standard boundary packages. """ + from .modflow.mfparbc import ModflowParBc as mfparbc # parse keywords if "nper" in kwargs: diff --git a/flopy/pest/tplarray.py b/flopy/pest/tplarray.py index c07156a819..c5aa9e3f38 100644 --- a/flopy/pest/tplarray.py +++ b/flopy/pest/tplarray.py @@ -1,6 +1,7 @@ import numpy as np -from ..utils.util_array import Util3d as Util3d + from ..utils.util_array import Transient2d as Transient2d +from ..utils.util_array import Util3d as Util3d def get_template_array(pakarray): diff --git a/flopy/plot/__init__.py b/flopy/plot/__init__.py index 016fdc8459..fa436e3a68 100644 --- a/flopy/plot/__init__.py +++ b/flopy/plot/__init__.py @@ -20,12 +20,12 @@ -------- """ +from .crosssection import PlotCrossSection +from .map import PlotMapView from .plotutil import ( + PlotUtilities, SwiConcentration, plot_shapefile, shapefile_extents, - PlotUtilities, ) -from .map import PlotMapView -from .crosssection import PlotCrossSection from .styles import styles diff --git a/flopy/plot/crosssection.py b/flopy/plot/crosssection.py index a1c8dcd00c..e84950249c 100644 --- a/flopy/plot/crosssection.py +++ b/flopy/plot/crosssection.py @@ -1,14 +1,13 @@ -import numpy as np +import copy +import warnings -import matplotlib.pyplot as plt import matplotlib.colors +import matplotlib.pyplot as plt +import numpy as np from matplotlib.patches import Polygon -from . import plotutil from ..utils import geometry - -import copy -import warnings +from . import plotutil warnings.simplefilter("always", PendingDeprecationWarning) @@ -1020,7 +1019,6 @@ def plot_pathline( """ from matplotlib.collections import LineCollection - from ..utils.geometry import point_in_polygon # make sure pathlines is a list if not isinstance(pl, list): @@ -1413,8 +1411,8 @@ def get_grid_patch_collection( patches : matplotlib.collections.PatchCollection """ - from matplotlib.patches import Polygon from matplotlib.collections import PatchCollection + from matplotlib.patches import Polygon use_cache = False if projpts is None: diff --git a/flopy/plot/map.py b/flopy/plot/map.py index f3cd4c4de4..e0ef87bfe3 100644 --- a/flopy/plot/map.py +++ b/flopy/plot/map.py @@ -1,13 +1,13 @@ -import numpy as np -from ..utils import geometry +import warnings -import matplotlib.pyplot as plt import matplotlib.colors -from matplotlib.collections import PathCollection, LineCollection +import matplotlib.pyplot as plt +import numpy as np +from matplotlib.collections import LineCollection, PathCollection from matplotlib.path import Path +from ..utils import geometry from . import plotutil -import warnings warnings.simplefilter("always", PendingDeprecationWarning) @@ -348,9 +348,6 @@ def plot_grid(self, **kwargs): lc : matplotlib.collections.LineCollection """ - - from matplotlib.collections import PatchCollection - ax = kwargs.pop("ax", self.ax) colors = kwargs.pop("colors", "grey") colors = kwargs.pop("color", colors) diff --git a/flopy/plot/plotutil.py b/flopy/plot/plotutil.py index 478ee3ee82..2d74402128 100644 --- a/flopy/plot/plotutil.py +++ b/flopy/plot/plotutil.py @@ -5,11 +5,13 @@ """ import os -import numpy as np import warnings + import matplotlib.pyplot as plt +import numpy as np + +from ..datbase import DataInterface, DataType from ..utils import Util3d, import_optional_dependency -from ..datbase import DataType, DataInterface warnings.simplefilter("ignore", RuntimeWarning) @@ -1585,8 +1587,6 @@ def centered_specific_discharge(Qx, Qy, Qz, delr, delc, sat_thk): Specific discharge arrays that have been interpolated to cell centers. """ - import warnings - warnings.warn( "centered_specific_discharge() has been deprecated and will be " "removed in version 3.3.5. Use " @@ -2089,12 +2089,12 @@ def shapefile_to_patch_collection(shp, radius=500.0, idx=None): Patch collection of shapes in the shapefile """ - from matplotlib.patches import Polygon, Circle, PathPatch import matplotlib.path as MPath from matplotlib.collections import PatchCollection + from matplotlib.patches import Circle, PathPatch, Polygon - from ..utils.geospatial_utils import GeoSpatialCollection from ..utils.geometry import point_in_polygon + from ..utils.geospatial_utils import GeoSpatialCollection geofeats = GeoSpatialCollection(shp) shapes = geofeats.shape @@ -2279,8 +2279,8 @@ def cvfd_to_patch_collection(verts, iverts): DeprecationWarning, ) - from matplotlib.patches import Polygon from matplotlib.collections import PatchCollection + from matplotlib.patches import Polygon ptchs = [] for ivertlist in iverts: @@ -2459,8 +2459,6 @@ def _set_coord_info(mg, xul, yul, xll, yll, rotation): ------- mg : fp.discretization.Grid object """ - import warnings - if xul is not None and yul is not None: if rotation is not None: mg._angrot = rotation @@ -2494,8 +2492,7 @@ def _depreciated_dis_handler(modelgrid, dis): """ # creates a new modelgrid instance with the dis information - from ..discretization import StructuredGrid, VertexGrid, UnstructuredGrid - import warnings + from ..discretization import StructuredGrid, UnstructuredGrid, VertexGrid warnings.warn( "the dis parameter has been depreciated and will be removed in " diff --git a/flopy/plot/styles.py b/flopy/plot/styles.py index 96272cd58d..82d1bba430 100644 --- a/flopy/plot/styles.py +++ b/flopy/plot/styles.py @@ -1,5 +1,6 @@ import os import platform + import matplotlib as mpl import matplotlib.pyplot as plt diff --git a/flopy/seawat/swt.py b/flopy/seawat/swt.py index 2ad41c879d..7c2554e9aa 100644 --- a/flopy/seawat/swt.py +++ b/flopy/seawat/swt.py @@ -1,12 +1,13 @@ import os + +from ..discretization.modeltime import ModelTime +from ..discretization.structuredgrid import StructuredGrid from ..mbase import BaseModel -from ..pakbase import Package from ..modflow import Modflow from ..mt3d import Mt3dms +from ..pakbase import Package from .swtvdf import SeawatVdf from .swtvsc import SeawatVsc -from ..discretization.structuredgrid import StructuredGrid -from ..discretization.modeltime import ModelTime class SeawatList(Package): diff --git a/flopy/seawat/swtvdf.py b/flopy/seawat/swtvdf.py index 459e502b19..1e7e37f53d 100644 --- a/flopy/seawat/swtvdf.py +++ b/flopy/seawat/swtvdf.py @@ -1,6 +1,7 @@ import numpy as np + from ..pakbase import Package -from ..utils import Util2d, Util3d +from ..utils import Util3d from ..utils.util_array import Transient3d diff --git a/flopy/seawat/swtvsc.py b/flopy/seawat/swtvsc.py index 8e897583a4..7a71d9d2c4 100644 --- a/flopy/seawat/swtvsc.py +++ b/flopy/seawat/swtvsc.py @@ -1,6 +1,7 @@ import numpy as np + from ..pakbase import Package -from ..utils import Util3d, Transient3d +from ..utils import Transient3d, Util3d class SeawatVsc(Package): diff --git a/flopy/utils/__init__.py b/flopy/utils/__init__.py index 5c79fa2ba6..c99008cebc 100644 --- a/flopy/utils/__init__.py +++ b/flopy/utils/__init__.py @@ -20,48 +20,43 @@ -------- """ -from .mfreadnam import parsenamefile -from .utl_import import import_optional_dependency -from .util_array import Util3d, Util2d, Transient2d, Transient3d, read1d -from .util_list import MfList +from .utl_import import import_optional_dependency # isort:skip from .binaryfile import ( BinaryHeader, - HeadFile, - UcnFile, CellBudgetFile, + HeadFile, HeadUFile, + UcnFile, ) +from .check import check +from .flopy_io import read_fixed_var, write_fixed_var from .formattedfile import FormattedHeadFile -from .modpathfile import PathlineFile, EndpointFile, TimeseriesFile -from .swroutputfile import ( - SwrStage, - SwrBudget, - SwrFlow, - SwrExchange, - SwrStructure, -) -from .observationfile import HydmodObs, SwrObs, Mf6Obs -from .reference import TemporalReference +from .gridintersect import GridIntersect, ModflowGridIndices from .mflistfile import ( + Mf6ListBudget, MfListBudget, MfusgListBudget, - SwtListBudget, SwrListBudget, - Mf6ListBudget, -) -from .check import check -from .utils_def import FlopyBinaryData, totim_to_datetime -from .flopy_io import read_fixed_var, write_fixed_var -from .zonbud import ( - ZoneBudget, - ZoneFile6, - ZoneBudget6, - ZBNetOutput, + SwtListBudget, ) -from .postprocessing import get_transmissivities, get_specific_discharge -from .sfroutputfile import SfrFile -from .recarray_utils import create_empty_recarray, ra_slice +from .mfreadnam import parsenamefile +from .modpathfile import EndpointFile, PathlineFile, TimeseriesFile from .mtlistfile import MtListBudget +from .observationfile import HydmodObs, Mf6Obs, SwrObs from .optionblock import OptionBlock +from .postprocessing import get_specific_discharge, get_transmissivities from .rasters import Raster -from .gridintersect import GridIntersect, ModflowGridIndices +from .recarray_utils import create_empty_recarray, ra_slice +from .reference import TemporalReference +from .sfroutputfile import SfrFile +from .swroutputfile import ( + SwrBudget, + SwrExchange, + SwrFlow, + SwrStage, + SwrStructure, +) +from .util_array import Transient2d, Transient3d, Util2d, Util3d, read1d +from .util_list import MfList +from .utils_def import FlopyBinaryData, totim_to_datetime +from .zonbud import ZBNetOutput, ZoneBudget, ZoneBudget6, ZoneFile6 diff --git a/flopy/utils/binaryfile.py b/flopy/utils/binaryfile.py index ae99bd2124..e9be3346c8 100755 --- a/flopy/utils/binaryfile.py +++ b/flopy/utils/binaryfile.py @@ -8,8 +8,10 @@ * CellBudgetFile (Binary cell-by-cell flow file) """ -import numpy as np import warnings + +import numpy as np + from ..utils.datafile import Header, LayerFile @@ -126,6 +128,7 @@ def binaryread_struct(file, vartype, shape=(1,), charlen=16): """ import struct + import numpy as np # store the mapping from type to struct format (fmt) diff --git a/flopy/utils/check.py b/flopy/utils/check.py index 3a62a819da..b293be9062 100644 --- a/flopy/utils/check.py +++ b/flopy/utils/check.py @@ -1,6 +1,8 @@ import os + import numpy as np from numpy.lib import recfunctions + from ..utils.recarray_utils import recarray from ..utils.util_array import Util3d diff --git a/flopy/utils/datafile.py b/flopy/utils/datafile.py index eb08c07d17..8718da144d 100755 --- a/flopy/utils/datafile.py +++ b/flopy/utils/datafile.py @@ -4,8 +4,6 @@ """ import numpy as np -import flopy.utils -from ..discretization.structuredgrid import StructuredGrid class Header: @@ -154,6 +152,8 @@ class LayerFile: """ def __init__(self, filename, precision, verbose, kwargs): + from ..discretization.structuredgrid import StructuredGrid + self.filename = filename self.precision = precision self.verbose = verbose diff --git a/flopy/utils/datautil.py b/flopy/utils/datautil.py index c499f91daa..c8bada4bb6 100644 --- a/flopy/utils/datautil.py +++ b/flopy/utils/datautil.py @@ -1,7 +1,8 @@ import os -import numpy as np import shlex +import numpy as np + def clean_filename(file_name): if ( diff --git a/flopy/utils/flopy_io.py b/flopy/utils/flopy_io.py index b7e2718704..084c9146df 100755 --- a/flopy/utils/flopy_io.py +++ b/flopy/utils/flopy_io.py @@ -3,8 +3,8 @@ """ import os import sys + import numpy as np -from ..utils import import_optional_dependency def _fmt_string(array, float_format="{}"): @@ -277,9 +277,9 @@ def flux_to_wel(cbc_file, text, precision="single", model=None, verbose=False): flopy.modflow.ModflowWel instance """ + from ..modflow import Modflow, ModflowWel from . import CellBudgetFile as CBF from .util_list import MfList - from ..modflow import Modflow, ModflowWel cbf = CBF(cbc_file, precision=precision, verbose=verbose) @@ -347,6 +347,8 @@ def loadtxt( ra : np.recarray Numpy record array of file contents. """ + from ..utils import import_optional_dependency + # test if pandas should be used, if available if use_pandas: pd = import_optional_dependency("pandas") diff --git a/flopy/utils/formattedfile.py b/flopy/utils/formattedfile.py index df8a9668a5..a835841ca6 100644 --- a/flopy/utils/formattedfile.py +++ b/flopy/utils/formattedfile.py @@ -7,6 +7,7 @@ """ import numpy as np + from ..utils.datafile import Header, LayerFile diff --git a/flopy/utils/geospatial_utils.py b/flopy/utils/geospatial_utils.py index afd279791c..0998f37e01 100644 --- a/flopy/utils/geospatial_utils.py +++ b/flopy/utils/geospatial_utils.py @@ -1,7 +1,7 @@ import numpy as np -from ..utils.geometry import Shape, Collection from ..utils import import_optional_dependency +from ..utils.geometry import Collection, Shape geojson = import_optional_dependency("geojson", errors="silent") geojson_classes = {} diff --git a/flopy/utils/gridgen.py b/flopy/utils/gridgen.py index 7f65bfda28..c5e937c0e5 100644 --- a/flopy/utils/gridgen.py +++ b/flopy/utils/gridgen.py @@ -1,15 +1,14 @@ import os -import numpy as np import subprocess -# flopy imports -from ..mfusg.mfusgdisu import MfUsgDisU -from ..mf6.modflow import ModflowGwfdis -from .util_array import Util2d # read1d, -from ..utils import import_optional_dependency +import numpy as np + from ..export.shapefile_utils import shp2recarray from ..mbase import which - +from ..mf6.modflow import ModflowGwfdis +from ..mfusg.mfusgdisu import MfUsgDisU +from ..utils import import_optional_dependency +from .util_array import Util2d # read1d, # todo # creation of line and polygon shapefiles from features (holes!) @@ -698,6 +697,7 @@ def plot( """ import matplotlib.pyplot as plt + from ..plot import plot_shapefile, shapefile_extents if ax is None: diff --git a/flopy/utils/gridintersect.py b/flopy/utils/gridintersect.py index e6605a41ce..0046c012ba 100644 --- a/flopy/utils/gridintersect.py +++ b/flopy/utils/gridintersect.py @@ -1,12 +1,12 @@ -import numpy as np import contextlib import warnings -from .utl_import import import_optional_dependency +import numpy as np from .geometry import transform from .geospatial_utils import GeoSpatialUtil from .parse_version import Version +from .utl_import import import_optional_dependency NUMPY_GE_121 = Version(np.__version__) >= Version("1.21") diff --git a/flopy/utils/lgrutil.py b/flopy/utils/lgrutil.py index 341e82ffbf..c0239824d5 100644 --- a/flopy/utils/lgrutil.py +++ b/flopy/utils/lgrutil.py @@ -1,4 +1,5 @@ import numpy as np + from ..modflow import Modflow from .util_array import Util2d, Util3d diff --git a/flopy/utils/mflistfile.py b/flopy/utils/mflistfile.py index 08ae2f1de8..0de2ff55bb 100644 --- a/flopy/utils/mflistfile.py +++ b/flopy/utils/mflistfile.py @@ -5,14 +5,15 @@ """ +import errno import os import re + import numpy as np -import errno -from ..utils.utils_def import totim_to_datetime -from ..utils.flopy_io import get_ts_sp from ..utils import import_optional_dependency +from ..utils.flopy_io import get_ts_sp +from ..utils.utils_def import totim_to_datetime class ListBudget: diff --git a/flopy/utils/modpathfile.py b/flopy/utils/modpathfile.py index 326a305928..49002cb76c 100644 --- a/flopy/utils/modpathfile.py +++ b/flopy/utils/modpathfile.py @@ -8,8 +8,8 @@ """ import itertools -import numpy as np +import numpy as np from numpy.lib.recfunctions import append_fields, stack_arrays from ..utils.flopy_io import loadtxt @@ -304,10 +304,10 @@ def write_shapefile( kwargs : keyword arguments to flopy.export.shapefile_utils.recarray2shp """ - from ..utils import geometry from ..discretization import StructuredGrid - from ..utils.geometry import LineString from ..export.shapefile_utils import recarray2shp + from ..utils import geometry + from ..utils.geometry import LineString series = data if series is None: @@ -1216,10 +1216,10 @@ def write_shapefile( kwargs : keyword arguments to flopy.export.shapefile_utils.recarray2shp """ - from ..utils import geometry from ..discretization import StructuredGrid - from ..utils.geometry import Point from ..export.shapefile_utils import recarray2shp + from ..utils import geometry + from ..utils.geometry import Point epd = endpoint_data.copy() if epd is None: diff --git a/flopy/utils/mtlistfile.py b/flopy/utils/mtlistfile.py index 75e777484a..035095646b 100644 --- a/flopy/utils/mtlistfile.py +++ b/flopy/utils/mtlistfile.py @@ -4,6 +4,7 @@ """ import warnings + import numpy as np from ..utils import import_optional_dependency diff --git a/flopy/utils/observationfile.py b/flopy/utils/observationfile.py index 3ca3506029..3166c96d1e 100644 --- a/flopy/utils/observationfile.py +++ b/flopy/utils/observationfile.py @@ -1,8 +1,10 @@ -import numpy as np import io -from ..utils.utils_def import FlopyBinaryData -from ..utils.flopy_io import get_ts_sp + +import numpy as np + from ..utils import import_optional_dependency +from ..utils.flopy_io import get_ts_sp +from ..utils.utils_def import FlopyBinaryData class ObsFiles(FlopyBinaryData): diff --git a/flopy/utils/optionblock.py b/flopy/utils/optionblock.py index 427616fbe9..edaf378372 100644 --- a/flopy/utils/optionblock.py +++ b/flopy/utils/optionblock.py @@ -1,4 +1,5 @@ import numpy as np + from ..utils import flopy_io diff --git a/flopy/utils/parse_version.py b/flopy/utils/parse_version.py index 45e1b8e6cd..70cc3ccb48 100644 --- a/flopy/utils/parse_version.py +++ b/flopy/utils/parse_version.py @@ -11,14 +11,8 @@ import collections import itertools import re -from typing import ( - Callable, - Iterator, - SupportsInt, - Tuple, - Union, -) import warnings +from typing import Callable, Iterator, SupportsInt, Tuple, Union __all__ = [ "parse", diff --git a/flopy/utils/postprocessing.py b/flopy/utils/postprocessing.py index ed02ead9ba..898bcd0a8a 100644 --- a/flopy/utils/postprocessing.py +++ b/flopy/utils/postprocessing.py @@ -1,5 +1,4 @@ import numpy as np -import warnings def get_transmissivities( diff --git a/flopy/utils/rasters.py b/flopy/utils/rasters.py index 6d4e856a66..f67b072f00 100644 --- a/flopy/utils/rasters.py +++ b/flopy/utils/rasters.py @@ -1,6 +1,7 @@ -import numpy as np -import threading import queue +import threading + +import numpy as np from .utl_import import import_optional_dependency diff --git a/flopy/utils/sfroutputfile.py b/flopy/utils/sfroutputfile.py index 861913e786..5e8d18ea72 100644 --- a/flopy/utils/sfroutputfile.py +++ b/flopy/utils/sfroutputfile.py @@ -1,4 +1,5 @@ import numpy as np + from ..utils import import_optional_dependency diff --git a/flopy/utils/triangle.py b/flopy/utils/triangle.py index 17fc9368a7..36b345c6ff 100644 --- a/flopy/utils/triangle.py +++ b/flopy/utils/triangle.py @@ -1,7 +1,9 @@ import os -import numpy as np -import matplotlib.pyplot as plt import subprocess + +import matplotlib.pyplot as plt +import numpy as np + from ..mbase import which from ..utils.cvfdutil import centroid_of_polygon from ..utils.geospatial_utils import GeoSpatialUtil @@ -241,8 +243,8 @@ def plot( None """ - from ..plot import PlotMapView from ..discretization import VertexGrid + from ..plot import PlotMapView cell2d = self.get_cell2d() vertices = self.get_vertices() diff --git a/flopy/utils/util_array.py b/flopy/utils/util_array.py index b7675c85d1..eabd989351 100644 --- a/flopy/utils/util_array.py +++ b/flopy/utils/util_array.py @@ -7,14 +7,16 @@ """ # from future.utils import with_metaclass +import copy import os import shutil -import copy -import numpy as np from warnings import warn + +import numpy as np + +from ..datbase import DataInterface, DataType from ..utils.binaryfile import BinaryHeader from ..utils.flopy_io import line_parse -from ..datbase import DataType, DataInterface class ArrayFormat: diff --git a/flopy/utils/util_list.py b/flopy/utils/util_list.py index 7121119aa9..51f460411d 100644 --- a/flopy/utils/util_list.py +++ b/flopy/utils/util_list.py @@ -9,10 +9,12 @@ """ import os import warnings + import numpy as np + from ..datbase import DataInterface, DataListInterface, DataType -from ..utils.recarray_utils import create_empty_recarray from ..utils import import_optional_dependency +from ..utils.recarray_utils import create_empty_recarray class MfList(DataInterface, DataListInterface): diff --git a/flopy/utils/utils_def.py b/flopy/utils/utils_def.py index 41aedd8702..bc62c17b1c 100644 --- a/flopy/utils/utils_def.py +++ b/flopy/utils/utils_def.py @@ -4,6 +4,7 @@ """ from datetime import timedelta + import numpy as np diff --git a/flopy/utils/voronoi.py b/flopy/utils/voronoi.py index 3303f811d6..ddc512081f 100644 --- a/flopy/utils/voronoi.py +++ b/flopy/utils/voronoi.py @@ -1,7 +1,7 @@ import numpy as np + from .cvfdutil import get_disv_gridprops from .geometry import point_in_polygon - from .utl_import import import_optional_dependency diff --git a/flopy/utils/zonbud.py b/flopy/utils/zonbud.py index d5fc662817..5174a78480 100644 --- a/flopy/utils/zonbud.py +++ b/flopy/utils/zonbud.py @@ -1,9 +1,11 @@ -import os import copy -import numpy as np +import os from itertools import groupby -from .utils_def import totim_to_datetime + +import numpy as np + from . import import_optional_dependency +from .utils_def import totim_to_datetime class ZoneBudget: diff --git a/pyproject.toml b/pyproject.toml index dbb4477760..f02003fe45 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,3 +6,8 @@ build-backend = "setuptools.build_meta" [tool.black] line-length = 79 target_version = ["py37"] + +[tool.isort] +profile = "black" +src_paths = ["flopy"] +line_length = 79 diff --git a/release/make-release.py b/release/make-release.py index e0453e8cc5..497d2b3668 100644 --- a/release/make-release.py +++ b/release/make-release.py @@ -1,10 +1,10 @@ #!/usr/bin/python -import subprocess -import os -import sys import datetime import json +import os +import subprocess +import sys # file_paths dictionary has file names and the path to the file. Enter '.' # as the path if the file is in the root repository directory diff --git a/release/run_notebooks.py b/release/run_notebooks.py index c3132dfd96..9751c274cd 100644 --- a/release/run_notebooks.py +++ b/release/run_notebooks.py @@ -1,6 +1,5 @@ import os import sys -import shutil # path to notebooks src_pths = ( diff --git a/release/update-version_changes.py b/release/update-version_changes.py index d007dfcea2..a4df2fd6b0 100644 --- a/release/update-version_changes.py +++ b/release/update-version_changes.py @@ -1,6 +1,6 @@ import os import sys -from subprocess import Popen, PIPE, STDOUT +from subprocess import PIPE, STDOUT, Popen PY3 = sys.version_info[0] >= 3