From c7f6657c34e47a303e20bc0fed4bcfbed2eb8631 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 10:31:52 +0100 Subject: [PATCH] [pre-commit.ci] pre-commit autoupdate (#345) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/psf/black: 23.12.0 → 24.2.0](https://github.com/psf/black/compare/23.12.0...24.2.0) - [github.com/asottile/pyupgrade: v3.15.0 → v3.15.1](https://github.com/asottile/pyupgrade/compare/v3.15.0...v3.15.1) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .pre-commit-config.yaml | 4 ++-- CHANGELOG.md | 2 +- docs/source/pyplots/basicEnvelope.py | 1 + docs/source/pyplots/basicEnvelope2.py | 1 + docs/source/pyplots/basicLines.py | 1 + docs/source/pyplots/basicLines2.py | 1 + docs/source/pyplots/basicMultiplotScatter.py | 1 + ema_workbench/analysis/b_and_w_plotting.py | 1 + ema_workbench/analysis/cart.py | 1 + ema_workbench/analysis/clusterer.py | 1 + ema_workbench/analysis/dimensional_stacking.py | 1 + ema_workbench/analysis/feature_scoring.py | 1 + ema_workbench/analysis/logistic_regression.py | 1 + ema_workbench/analysis/pairs_plotting.py | 1 + ema_workbench/analysis/parcoords.py | 1 + ema_workbench/analysis/plotting.py | 1 + ema_workbench/analysis/plotting_util.py | 1 + ema_workbench/analysis/prim.py | 1 + ema_workbench/analysis/regional_sa.py | 1 + ema_workbench/analysis/scenario_discovery_util.py | 1 + ema_workbench/connectors/netlogo.py | 1 + ema_workbench/connectors/pysd_connector.py | 1 + ema_workbench/connectors/simio_connector.py | 1 + ema_workbench/connectors/vensim.py | 1 + ema_workbench/connectors/vensimDLLwrapper.py | 1 + ema_workbench/em_framework/callbacks.py | 1 + ema_workbench/em_framework/evaluators.py | 1 + ema_workbench/em_framework/experiment_runner.py | 1 + ema_workbench/em_framework/futures_ipyparallel.py | 1 + ema_workbench/em_framework/futures_multiprocessing.py | 1 + ema_workbench/em_framework/model.py | 1 + ema_workbench/em_framework/optimization.py | 1 + ema_workbench/em_framework/outcomes.py | 1 + ema_workbench/em_framework/parameters.py | 4 ++-- ema_workbench/em_framework/salib_samplers.py | 1 + ema_workbench/em_framework/samplers.py | 1 + ema_workbench/em_framework/util.py | 1 + ema_workbench/examples/example_excel.py | 1 + ema_workbench/examples/example_flu.py | 1 + ema_workbench/examples/example_lake_model.py | 1 + ema_workbench/examples/example_mpi_lake_model.py | 1 + ema_workbench/examples/example_netlogo.py | 1 + ema_workbench/examples/example_python.py | 1 + ema_workbench/examples/example_simio.py | 1 + ema_workbench/examples/example_vensim.py | 1 + ema_workbench/examples/example_vensim_advanced_flu.py | 1 + ema_workbench/examples/example_vensim_energy.py | 1 + ema_workbench/examples/example_vensim_flu.py | 1 + ema_workbench/examples/example_vensim_lookup.py | 1 + ema_workbench/examples/example_vensim_no_policy_flu.py | 1 + ema_workbench/examples/example_vensim_scarcity.py | 1 + ema_workbench/examples/feature_scoring_flu.py | 1 + ema_workbench/examples/feature_scoring_flu_confidence.py | 1 + ema_workbench/examples/feature_scoring_flu_overtime.py | 1 + ema_workbench/examples/model_debugger.py | 1 + ema_workbench/examples/optimization_lake_model_dps.py | 1 + .../examples/optimization_lake_model_intertemporal.py | 1 + ema_workbench/examples/outputspace_exploration_lake_model.py | 1 + ema_workbench/examples/plotting_envelopes_flu.py | 1 + ema_workbench/examples/plotting_envelopes_with_lines_flu.py | 1 + ema_workbench/examples/plotting_kdeovertime_flu.py | 1 + ema_workbench/examples/plotting_lines_flu.py | 1 + ema_workbench/examples/plotting_multiple_densities_flu.py | 1 + ema_workbench/examples/plotting_pairsplot_flu.py | 1 + ema_workbench/examples/regional_sa_flu.py | 1 + ema_workbench/examples/robust_optimization_lake_model_dps.py | 1 + ema_workbench/examples/sample_jointly_lake_model.py | 1 + ema_workbench/examples/sample_sobol_lake_model.py | 1 + ema_workbench/examples/sd_cart_flu.py | 1 + ema_workbench/examples/sd_cart_wcm.py | 1 + ema_workbench/examples/sd_dimensional_stacking_flu.py | 1 + ema_workbench/examples/sd_logit_flu_example.py | 1 + ema_workbench/examples/sd_prim_PCA_flu.py | 1 + ema_workbench/examples/sd_prim_bryant_and_lempert.py | 1 + ema_workbench/examples/sd_prim_constrained.py | 1 + ema_workbench/examples/sd_prim_flu.py | 1 + ema_workbench/examples/sd_prim_wcm.py | 1 + ema_workbench/examples/timeseries_clustering_flu.py | 1 + ema_workbench/util/ema_logging.py | 1 + test/models/Sales_Agent_Market_Building_Dynamics.py | 1 + test/models/Sales_Agent_Motivation_Dynamics.py | 1 + test/models/Teacup.py | 1 + test/test_analysis/test_b_and_w_plotting.py | 1 + test/test_analysis/test_cart.py | 1 + test/test_analysis/test_dimensional_stacking.py | 1 + test/test_analysis/test_feature_scoring.py | 1 + test/test_analysis/test_logistic_regression.py | 1 + test/test_analysis/test_pairs_plotting.py | 1 + test/test_analysis/test_parcoords.py | 1 + test/test_analysis/test_plotting.py | 1 + test/test_analysis/test_prim.py | 1 + test/test_analysis/test_regional_sa.py | 1 + test/test_analysis/test_scenario_discovery_util.py | 1 + test/test_connectors/test_netlogo.py | 1 + test/test_connectors/test_pysd_interface.py | 1 + test/test_connectors/test_vensim.py | 1 + test/test_em_framework/test_callback.py | 1 + test/test_em_framework/test_evaluators.py | 1 + test/test_em_framework/test_futures_ipyparallel.py | 1 + test/test_em_framework/test_futures_multiprocessing.py | 1 + test/test_em_framework/test_model.py | 1 + test/test_em_framework/test_optimization.py | 1 - test/test_em_framework/test_outcomes.py | 1 + test/test_em_framework/test_samplers.py | 1 + test/test_util/test_ema_logging.py | 1 + test/test_util/test_utilities.py | 1 + test/utilities.py | 1 + 107 files changed, 108 insertions(+), 6 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ba4e351bc..ba409ded9 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,11 +4,11 @@ ci: repos: - repo: https://github.com/psf/black - rev: 23.12.0 + rev: 24.2.0 hooks: - id: black-jupyter - repo: https://github.com/asottile/pyupgrade - rev: v3.15.0 + rev: v3.15.1 hooks: - id: pyupgrade args: [--py39-plus] diff --git a/CHANGELOG.md b/CHANGELOG.md index 020e5cce9..748ed19e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ In the 2.5.0 release of the EMAworkbench we introduce a new experimental MPIeval Furthermore, the pair plots for scenario discovery now allow contour plots and bivariate histograms (#288). When doing Prim you can inspect multiple boxed and display them in a single figure (#317). ### Breaking changes -From 3.0 onwards, the names of parameters, constants, constraints, and outcomes must be valid python identifiers. From this version onwards, a DeprecationWarning is raised if the name is not a valid Python identifier. +From 3.0 onwards, the names of parameters, constants, constraints, and outcomes must be valid python identifiers. From this version onwards, a DeprecationWarning is raised if the name is not a valid Python identifier. ### What's Changed #### 🎉 New features added diff --git a/docs/source/pyplots/basicEnvelope.py b/docs/source/pyplots/basicEnvelope.py index 8d880b611..968c9b274 100644 --- a/docs/source/pyplots/basicEnvelope.py +++ b/docs/source/pyplots/basicEnvelope.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt from expWorkbench import load_results diff --git a/docs/source/pyplots/basicEnvelope2.py b/docs/source/pyplots/basicEnvelope2.py index 4568a4ad3..8895a17e8 100644 --- a/docs/source/pyplots/basicEnvelope2.py +++ b/docs/source/pyplots/basicEnvelope2.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt from expWorkbench import load_results diff --git a/docs/source/pyplots/basicLines.py b/docs/source/pyplots/basicLines.py index 8c08a6643..113b7c498 100644 --- a/docs/source/pyplots/basicLines.py +++ b/docs/source/pyplots/basicLines.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt from expWorkbench import load_results diff --git a/docs/source/pyplots/basicLines2.py b/docs/source/pyplots/basicLines2.py index 919f24d5b..4404892b7 100644 --- a/docs/source/pyplots/basicLines2.py +++ b/docs/source/pyplots/basicLines2.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt from expWorkbench import load_results diff --git a/docs/source/pyplots/basicMultiplotScatter.py b/docs/source/pyplots/basicMultiplotScatter.py index 33b2feec6..33c4cb203 100644 --- a/docs/source/pyplots/basicMultiplotScatter.py +++ b/docs/source/pyplots/basicMultiplotScatter.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt from expWorkbench import load_results diff --git a/ema_workbench/analysis/b_and_w_plotting.py b/ema_workbench/analysis/b_and_w_plotting.py index b97c0c934..8e0b53ba1 100644 --- a/ema_workbench/analysis/b_and_w_plotting.py +++ b/ema_workbench/analysis/b_and_w_plotting.py @@ -5,6 +5,7 @@ what is needed for the workbench. """ + import itertools import math diff --git a/ema_workbench/analysis/cart.py b/ema_workbench/analysis/cart.py index 6d2a4f16d..ae95066fe 100644 --- a/ema_workbench/analysis/cart.py +++ b/ema_workbench/analysis/cart.py @@ -3,6 +3,7 @@ a wrapper around scikit-learn's version of CART. """ + import io import math from io import StringIO diff --git a/ema_workbench/analysis/clusterer.py b/ema_workbench/analysis/clusterer.py index c892c406d..7b477d2c6 100644 --- a/ema_workbench/analysis/clusterer.py +++ b/ema_workbench/analysis/clusterer.py @@ -3,6 +3,7 @@ complex invariant distance. For details see `Steinmann et al (2020) `_ """ + import itertools import matplotlib.pyplot as plt diff --git a/ema_workbench/analysis/dimensional_stacking.py b/ema_workbench/analysis/dimensional_stacking.py index 43b31ece8..e0d9d6811 100644 --- a/ema_workbench/analysis/dimensional_stacking.py +++ b/ema_workbench/analysis/dimensional_stacking.py @@ -11,6 +11,7 @@ by simply selecting uncertain factors in some other manner. """ + import matplotlib as mpl import matplotlib.pyplot as plt import numpy as np diff --git a/ema_workbench/analysis/feature_scoring.py b/ema_workbench/analysis/feature_scoring.py index 903ceb6da..9e34edcaa 100644 --- a/ema_workbench/analysis/feature_scoring.py +++ b/ema_workbench/analysis/feature_scoring.py @@ -1,4 +1,5 @@ """Feature scoring functionality""" + import math from operator import itemgetter diff --git a/ema_workbench/analysis/logistic_regression.py b/ema_workbench/analysis/logistic_regression.py index 388e54248..562709946 100644 --- a/ema_workbench/analysis/logistic_regression.py +++ b/ema_workbench/analysis/logistic_regression.py @@ -8,6 +8,7 @@ as much as possible on the api used for PRIM and CART. """ + import sys import matplotlib as mpl diff --git a/ema_workbench/analysis/pairs_plotting.py b/ema_workbench/analysis/pairs_plotting.py index 63b39afdc..316965985 100644 --- a/ema_workbench/analysis/pairs_plotting.py +++ b/ema_workbench/analysis/pairs_plotting.py @@ -3,6 +3,7 @@ This module provides R style pairs plotting functionality. """ + import matplotlib.cm as cm import matplotlib.gridspec as gridspec import matplotlib.pyplot as plt diff --git a/ema_workbench/analysis/parcoords.py b/ema_workbench/analysis/parcoords.py index 8aee7cfb5..a02ba5f80 100644 --- a/ema_workbench/analysis/parcoords.py +++ b/ema_workbench/analysis/parcoords.py @@ -2,6 +2,7 @@ using matplotlib. """ + import matplotlib.pyplot as plt import matplotlib.ticker as ticker import pandas as pd diff --git a/ema_workbench/analysis/plotting.py b/ema_workbench/analysis/plotting.py index 86ac7eaf5..2068ee59d 100644 --- a/ema_workbench/analysis/plotting.py +++ b/ema_workbench/analysis/plotting.py @@ -4,6 +4,7 @@ be used as is, or serve as an example for writing your own code. """ + import matplotlib.pyplot as plt import numpy as np from matplotlib.patches import ConnectionPatch diff --git a/ema_workbench/analysis/plotting_util.py b/ema_workbench/analysis/plotting_util.py index 5a06c1ab3..1d32b7d52 100644 --- a/ema_workbench/analysis/plotting_util.py +++ b/ema_workbench/analysis/plotting_util.py @@ -3,6 +3,7 @@ Plotting utility functions """ + import copy import enum diff --git a/ema_workbench/analysis/prim.py b/ema_workbench/analysis/prim.py index 1af8ee400..15798e926 100644 --- a/ema_workbench/analysis/prim.py +++ b/ema_workbench/analysis/prim.py @@ -13,6 +13,7 @@ the jupyter notebook. """ + import copy import itertools import warnings diff --git a/ema_workbench/analysis/regional_sa.py b/ema_workbench/analysis/regional_sa.py index c17087a86..7982f905d 100644 --- a/ema_workbench/analysis/regional_sa.py +++ b/ema_workbench/analysis/regional_sa.py @@ -6,6 +6,7 @@ zoom in on any given uncertainty in more detail. """ + import math import operator diff --git a/ema_workbench/analysis/scenario_discovery_util.py b/ema_workbench/analysis/scenario_discovery_util.py index 3f21a544f..2d3e3c086 100644 --- a/ema_workbench/analysis/scenario_discovery_util.py +++ b/ema_workbench/analysis/scenario_discovery_util.py @@ -1,6 +1,7 @@ """ Scenario discovery utilities used by both :mod:`cart` and :mod:`prim` """ + import abc import enum import itertools diff --git a/ema_workbench/connectors/netlogo.py b/ema_workbench/connectors/netlogo.py index eac504ac8..e25cff41a 100644 --- a/ema_workbench/connectors/netlogo.py +++ b/ema_workbench/connectors/netlogo.py @@ -11,6 +11,7 @@ substantial overhead. """ + from pynetlogo.core import NetLogoException from ema_workbench.em_framework.model import Replicator, SingleReplication diff --git a/ema_workbench/connectors/pysd_connector.py b/ema_workbench/connectors/pysd_connector.py index 2a90a03e1..ffeb4e8ea 100644 --- a/ema_workbench/connectors/pysd_connector.py +++ b/ema_workbench/connectors/pysd_connector.py @@ -1,6 +1,7 @@ """ pysd connector """ + import os import pysd diff --git a/ema_workbench/connectors/simio_connector.py b/ema_workbench/connectors/simio_connector.py index 2fb08c003..9eac085a4 100644 --- a/ema_workbench/connectors/simio_connector.py +++ b/ema_workbench/connectors/simio_connector.py @@ -2,6 +2,7 @@ connector assumes Simio is installed in C:/Program Files (x86)/Simio """ + import os import sys import numpy as np diff --git a/ema_workbench/connectors/vensim.py b/ema_workbench/connectors/vensim.py index 9bc781769..8c17127b7 100644 --- a/ema_workbench/connectors/vensim.py +++ b/ema_workbench/connectors/vensim.py @@ -8,6 +8,7 @@ :mod:`vensimDLLwrapper` can also be used directly. """ + import decimal import math import os diff --git a/ema_workbench/connectors/vensimDLLwrapper.py b/ema_workbench/connectors/vensimDLLwrapper.py index d9304f580..95cc52d9e 100644 --- a/ema_workbench/connectors/vensimDLLwrapper.py +++ b/ema_workbench/connectors/vensimDLLwrapper.py @@ -12,6 +12,7 @@ """ + import ctypes import struct import sys diff --git a/ema_workbench/em_framework/callbacks.py b/ema_workbench/em_framework/callbacks.py index f85794b11..d6e4cd90a 100644 --- a/ema_workbench/em_framework/callbacks.py +++ b/ema_workbench/em_framework/callbacks.py @@ -12,6 +12,7 @@ progress, always call super. """ + import abc import csv import os diff --git a/ema_workbench/em_framework/evaluators.py b/ema_workbench/em_framework/evaluators.py index d68189a28..fe642e33b 100644 --- a/ema_workbench/em_framework/evaluators.py +++ b/ema_workbench/em_framework/evaluators.py @@ -3,6 +3,7 @@ optimization """ + import enum import numbers import os diff --git a/ema_workbench/em_framework/experiment_runner.py b/ema_workbench/em_framework/experiment_runner.py index d01fee5d4..b3413723d 100644 --- a/ema_workbench/em_framework/experiment_runner.py +++ b/ema_workbench/em_framework/experiment_runner.py @@ -2,6 +2,7 @@ helper module for running experiments and keeping track of which model has been initialized with which policy. """ + from ema_workbench.util.ema_logging import method_logger from ..util import get_module_logger, EMAError, CaseError diff --git a/ema_workbench/em_framework/futures_ipyparallel.py b/ema_workbench/em_framework/futures_ipyparallel.py index a02a4c670..3993f00d5 100644 --- a/ema_workbench/em_framework/futures_ipyparallel.py +++ b/ema_workbench/em_framework/futures_ipyparallel.py @@ -3,6 +3,7 @@ with IPython parallel. """ + import collections import logging import os diff --git a/ema_workbench/em_framework/futures_multiprocessing.py b/ema_workbench/em_framework/futures_multiprocessing.py index 43c9174db..e32b2b482 100644 --- a/ema_workbench/em_framework/futures_multiprocessing.py +++ b/ema_workbench/em_framework/futures_multiprocessing.py @@ -2,6 +2,7 @@ support for using the multiprocessing library in combination with the workbench """ + import logging import multiprocessing import os diff --git a/ema_workbench/em_framework/model.py b/ema_workbench/em_framework/model.py index 9e1846b4c..7aa3df875 100644 --- a/ema_workbench/em_framework/model.py +++ b/ema_workbench/em_framework/model.py @@ -4,6 +4,7 @@ an instance of an extension of this abstract base class. """ + import operator import os import warnings diff --git a/ema_workbench/em_framework/optimization.py b/ema_workbench/em_framework/optimization.py index 27795e5d4..09dcfd5e7 100644 --- a/ema_workbench/em_framework/optimization.py +++ b/ema_workbench/em_framework/optimization.py @@ -2,6 +2,7 @@ """ + import copy import functools import os diff --git a/ema_workbench/em_framework/outcomes.py b/ema_workbench/em_framework/outcomes.py index ff8d9cde9..ec0d4a6b8 100644 --- a/ema_workbench/em_framework/outcomes.py +++ b/ema_workbench/em_framework/outcomes.py @@ -2,6 +2,7 @@ Module for outcome classes """ + import abc import collections import numbers diff --git a/ema_workbench/em_framework/parameters.py b/ema_workbench/em_framework/parameters.py index a924dd3fc..9e3351e4c 100644 --- a/ema_workbench/em_framework/parameters.py +++ b/ema_workbench/em_framework/parameters.py @@ -1,4 +1,5 @@ """parameters and related helper classes and functions""" + import abc import numbers @@ -43,8 +44,7 @@ def __set_name__(self, cls, name): self.internal_name = "_" + name @abc.abstractmethod - def get_bound(self, instance): - ... + def get_bound(self, instance): ... class UpperBound(Bound): diff --git a/ema_workbench/em_framework/salib_samplers.py b/ema_workbench/em_framework/salib_samplers.py index b36a4a1bc..5b31eacf6 100644 --- a/ema_workbench/em_framework/salib_samplers.py +++ b/ema_workbench/em_framework/salib_samplers.py @@ -2,6 +2,7 @@ Samplers for working with SALib """ + import operator import warnings diff --git a/ema_workbench/em_framework/samplers.py b/ema_workbench/em_framework/samplers.py index 5182af6d7..27378f6a1 100644 --- a/ema_workbench/em_framework/samplers.py +++ b/ema_workbench/em_framework/samplers.py @@ -6,6 +6,7 @@ Monte Carlo sampling. """ + import abc import itertools import operator diff --git a/ema_workbench/em_framework/util.py b/ema_workbench/em_framework/util.py index acb8e1003..46912732d 100644 --- a/ema_workbench/em_framework/util.py +++ b/ema_workbench/em_framework/util.py @@ -1,4 +1,5 @@ """utilities used throughout em_framework""" + import copy import itertools from collections import OrderedDict, UserDict diff --git a/ema_workbench/examples/example_excel.py b/ema_workbench/examples/example_excel.py index 528c38aa9..d9e07a406 100644 --- a/ema_workbench/examples/example_excel.py +++ b/ema_workbench/examples/example_excel.py @@ -10,6 +10,7 @@ .. codeauthor:: jhkwakkel """ + from ema_workbench import RealParameter, TimeSeriesOutcome, ema_logging, perform_experiments from ema_workbench.connectors.excel import ExcelModel diff --git a/ema_workbench/examples/example_flu.py b/ema_workbench/examples/example_flu.py index d26fdc186..4a5636dea 100644 --- a/ema_workbench/examples/example_flu.py +++ b/ema_workbench/examples/example_flu.py @@ -11,6 +11,7 @@ chamarat """ + import matplotlib.pyplot as plt import numpy as np from numpy import sin, min, exp diff --git a/ema_workbench/examples/example_lake_model.py b/ema_workbench/examples/example_lake_model.py index f0c013df8..c4a20bef2 100644 --- a/ema_workbench/examples/example_lake_model.py +++ b/ema_workbench/examples/example_lake_model.py @@ -5,6 +5,7 @@ see https://gist.github.com/dhadka/a8d7095c98130d8f73bc """ + import math import numpy as np diff --git a/ema_workbench/examples/example_mpi_lake_model.py b/ema_workbench/examples/example_mpi_lake_model.py index cd67ae5f1..157e03f31 100644 --- a/ema_workbench/examples/example_mpi_lake_model.py +++ b/ema_workbench/examples/example_mpi_lake_model.py @@ -5,6 +5,7 @@ see https://gist.github.com/dhadka/a8d7095c98130d8f73bc """ + import math import time diff --git a/ema_workbench/examples/example_netlogo.py b/ema_workbench/examples/example_netlogo.py index 541018009..ad5be1b5e 100644 --- a/ema_workbench/examples/example_netlogo.py +++ b/ema_workbench/examples/example_netlogo.py @@ -7,6 +7,7 @@ with the one that comes with NetLogo. """ + import numpy as np from ema_workbench import ( diff --git a/ema_workbench/examples/example_python.py b/ema_workbench/examples/example_python.py index 810c69379..88b0d0f9e 100644 --- a/ema_workbench/examples/example_python.py +++ b/ema_workbench/examples/example_python.py @@ -6,6 +6,7 @@ .. codeauthor:: jhkwakkel """ + from ema_workbench import Model, RealParameter, ScalarOutcome, ema_logging, perform_experiments diff --git a/ema_workbench/examples/example_simio.py b/ema_workbench/examples/example_simio.py index 36268dcf3..88676b9a0 100644 --- a/ema_workbench/examples/example_simio.py +++ b/ema_workbench/examples/example_simio.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + from ema_workbench import ema_logging, CategoricalParameter, MultiprocessingEvaluator, ScalarOutcome from ema_workbench.connectors.simio_connector import SimioModel diff --git a/ema_workbench/examples/example_vensim.py b/ema_workbench/examples/example_vensim.py index 176edd18d..308b838c8 100644 --- a/ema_workbench/examples/example_vensim.py +++ b/ema_workbench/examples/example_vensim.py @@ -8,6 +8,7 @@ .. codeauthor:: jhkwakkel chamarat """ + from ema_workbench import TimeSeriesOutcome, perform_experiments, RealParameter, ema_logging from ema_workbench.connectors.vensim import VensimModel diff --git a/ema_workbench/examples/example_vensim_advanced_flu.py b/ema_workbench/examples/example_vensim_advanced_flu.py index ab4cfca57..d769b901f 100644 --- a/ema_workbench/examples/example_vensim_advanced_flu.py +++ b/ema_workbench/examples/example_vensim_advanced_flu.py @@ -8,6 +8,7 @@ .. codeauthor:: jhkwakkel epruyt """ + import numpy as np from ema_workbench import ( diff --git a/ema_workbench/examples/example_vensim_energy.py b/ema_workbench/examples/example_vensim_energy.py index b432d7354..8b3c2844f 100644 --- a/ema_workbench/examples/example_vensim_energy.py +++ b/ema_workbench/examples/example_vensim_energy.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + from ema_workbench import ( RealParameter, TimeSeriesOutcome, diff --git a/ema_workbench/examples/example_vensim_flu.py b/ema_workbench/examples/example_vensim_flu.py index a12ed632c..4ceca6cbc 100644 --- a/ema_workbench/examples/example_vensim_flu.py +++ b/ema_workbench/examples/example_vensim_flu.py @@ -8,6 +8,7 @@ .. codeauthor:: jhkwakkel epruyt """ + import numpy as np from ema_workbench import ( diff --git a/ema_workbench/examples/example_vensim_lookup.py b/ema_workbench/examples/example_vensim_lookup.py index c9fafb6e4..1f71b9959 100644 --- a/ema_workbench/examples/example_vensim_lookup.py +++ b/ema_workbench/examples/example_vensim_lookup.py @@ -8,6 +8,7 @@ @author: sibeleker @author: jhkwakkel """ + import matplotlib.pyplot as plt from ema_workbench import TimeSeriesOutcome, perform_experiments, ema_logging diff --git a/ema_workbench/examples/example_vensim_no_policy_flu.py b/ema_workbench/examples/example_vensim_no_policy_flu.py index bf3c32851..89268820d 100644 --- a/ema_workbench/examples/example_vensim_no_policy_flu.py +++ b/ema_workbench/examples/example_vensim_no_policy_flu.py @@ -8,6 +8,7 @@ .. codeauthor:: jhkwakkel epruyt """ + from ema_workbench import ( RealParameter, TimeSeriesOutcome, diff --git a/ema_workbench/examples/example_vensim_scarcity.py b/ema_workbench/examples/example_vensim_scarcity.py index cefdd1c23..3ecb4a1dc 100644 --- a/ema_workbench/examples/example_vensim_scarcity.py +++ b/ema_workbench/examples/example_vensim_scarcity.py @@ -4,6 +4,7 @@ .. codeauthor:: jhkwakkel epruyt """ + from math import exp from ema_workbench.connectors.vensim import VensimModel diff --git a/ema_workbench/examples/feature_scoring_flu.py b/ema_workbench/examples/feature_scoring_flu.py index 16e442619..9867fa858 100644 --- a/ema_workbench/examples/feature_scoring_flu.py +++ b/ema_workbench/examples/feature_scoring_flu.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import numpy as np import seaborn as sns diff --git a/ema_workbench/examples/feature_scoring_flu_confidence.py b/ema_workbench/examples/feature_scoring_flu_confidence.py index 697472b1a..83079e75a 100644 --- a/ema_workbench/examples/feature_scoring_flu_confidence.py +++ b/ema_workbench/examples/feature_scoring_flu_confidence.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import numpy as np import pandas as pd diff --git a/ema_workbench/examples/feature_scoring_flu_overtime.py b/ema_workbench/examples/feature_scoring_flu_overtime.py index 5879d3ccf..a003b16db 100644 --- a/ema_workbench/examples/feature_scoring_flu_overtime.py +++ b/ema_workbench/examples/feature_scoring_flu_overtime.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import pandas as pd import seaborn as sns diff --git a/ema_workbench/examples/model_debugger.py b/ema_workbench/examples/model_debugger.py index ebb6233a9..a4dd35581 100644 --- a/ema_workbench/examples/model_debugger.py +++ b/ema_workbench/examples/model_debugger.py @@ -24,6 +24,7 @@ 6. Vensim tells you about your critical mistake """ + fileSpecifyingError = "" pathToExistingModel = "/salinization/Verzilting_aanpassingen incorrect.mdl" diff --git a/ema_workbench/examples/optimization_lake_model_dps.py b/ema_workbench/examples/optimization_lake_model_dps.py index 97b71e162..60bbbc130 100644 --- a/ema_workbench/examples/optimization_lake_model_dps.py +++ b/ema_workbench/examples/optimization_lake_model_dps.py @@ -10,6 +10,7 @@ Software 89, 159-171. """ + import math import numpy as np diff --git a/ema_workbench/examples/optimization_lake_model_intertemporal.py b/ema_workbench/examples/optimization_lake_model_intertemporal.py index cfe05f317..b6ca3cc5c 100644 --- a/ema_workbench/examples/optimization_lake_model_intertemporal.py +++ b/ema_workbench/examples/optimization_lake_model_intertemporal.py @@ -5,6 +5,7 @@ see https://gist.github.com/dhadka/a8d7095c98130d8f73bc """ + import math import numpy as np diff --git a/ema_workbench/examples/outputspace_exploration_lake_model.py b/ema_workbench/examples/outputspace_exploration_lake_model.py index 0df5e22dd..57f226c18 100644 --- a/ema_workbench/examples/outputspace_exploration_lake_model.py +++ b/ema_workbench/examples/outputspace_exploration_lake_model.py @@ -5,6 +5,7 @@ see https://gist.github.com/dhadka/a8d7095c98130d8f73bc """ + import math import numpy as np diff --git a/ema_workbench/examples/plotting_envelopes_flu.py b/ema_workbench/examples/plotting_envelopes_flu.py index b8d612ece..7bc0f4077 100644 --- a/ema_workbench/examples/plotting_envelopes_flu.py +++ b/ema_workbench/examples/plotting_envelopes_flu.py @@ -3,6 +3,7 @@ @author: jhkwakkel@tudelft.net """ + import matplotlib.pyplot as plt from ema_workbench import ema_logging, load_results diff --git a/ema_workbench/examples/plotting_envelopes_with_lines_flu.py b/ema_workbench/examples/plotting_envelopes_with_lines_flu.py index b954ffe38..080324e8b 100644 --- a/ema_workbench/examples/plotting_envelopes_with_lines_flu.py +++ b/ema_workbench/examples/plotting_envelopes_with_lines_flu.py @@ -3,6 +3,7 @@ @author: jhkwakkel@tudelft.net """ + import matplotlib.pyplot as plt import numpy as np diff --git a/ema_workbench/examples/plotting_kdeovertime_flu.py b/ema_workbench/examples/plotting_kdeovertime_flu.py index 7a882c073..f8307b1ee 100644 --- a/ema_workbench/examples/plotting_kdeovertime_flu.py +++ b/ema_workbench/examples/plotting_kdeovertime_flu.py @@ -3,6 +3,7 @@ @author: jhkwakkel@tudelft.net """ + import matplotlib.pyplot as plt from ema_workbench import ema_logging, load_results diff --git a/ema_workbench/examples/plotting_lines_flu.py b/ema_workbench/examples/plotting_lines_flu.py index 6c72cb65c..dc070237e 100644 --- a/ema_workbench/examples/plotting_lines_flu.py +++ b/ema_workbench/examples/plotting_lines_flu.py @@ -3,6 +3,7 @@ @author: jhkwakkel@tudelft.net """ + import matplotlib.pyplot as plt from ema_workbench import ema_logging, load_results diff --git a/ema_workbench/examples/plotting_multiple_densities_flu.py b/ema_workbench/examples/plotting_multiple_densities_flu.py index dcb650585..9de8d2907 100644 --- a/ema_workbench/examples/plotting_multiple_densities_flu.py +++ b/ema_workbench/examples/plotting_multiple_densities_flu.py @@ -3,6 +3,7 @@ @author: jhkwakkel@tudelft.net """ + import math import matplotlib.pyplot as plt diff --git a/ema_workbench/examples/plotting_pairsplot_flu.py b/ema_workbench/examples/plotting_pairsplot_flu.py index 4f994f5fe..6ee84a220 100644 --- a/ema_workbench/examples/plotting_pairsplot_flu.py +++ b/ema_workbench/examples/plotting_pairsplot_flu.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import matplotlib.pyplot as plt import numpy as np diff --git a/ema_workbench/examples/regional_sa_flu.py b/ema_workbench/examples/regional_sa_flu.py index fd0e4e0eb..e91cb21dc 100644 --- a/ema_workbench/examples/regional_sa_flu.py +++ b/ema_workbench/examples/regional_sa_flu.py @@ -2,6 +2,7 @@ """ + import matplotlib.pyplot as plt from ema_workbench.analysis import regional_sa diff --git a/ema_workbench/examples/robust_optimization_lake_model_dps.py b/ema_workbench/examples/robust_optimization_lake_model_dps.py index 2af53519c..d1646bbb6 100644 --- a/ema_workbench/examples/robust_optimization_lake_model_dps.py +++ b/ema_workbench/examples/robust_optimization_lake_model_dps.py @@ -9,6 +9,7 @@ """ + import math import numpy as np diff --git a/ema_workbench/examples/sample_jointly_lake_model.py b/ema_workbench/examples/sample_jointly_lake_model.py index 82570e77a..48ce06d72 100644 --- a/ema_workbench/examples/sample_jointly_lake_model.py +++ b/ema_workbench/examples/sample_jointly_lake_model.py @@ -5,6 +5,7 @@ uncertainties and levers at the same time. """ + import math import numpy as np diff --git a/ema_workbench/examples/sample_sobol_lake_model.py b/ema_workbench/examples/sample_sobol_lake_model.py index 519bf679f..6e0ccba8f 100644 --- a/ema_workbench/examples/sample_sobol_lake_model.py +++ b/ema_workbench/examples/sample_sobol_lake_model.py @@ -5,6 +5,7 @@ see https://gist.github.com/dhadka/a8d7095c98130d8f73bc """ + import math import numpy as np diff --git a/ema_workbench/examples/sd_cart_flu.py b/ema_workbench/examples/sd_cart_flu.py index 248f00b5e..c91269501 100644 --- a/ema_workbench/examples/sd_cart_flu.py +++ b/ema_workbench/examples/sd_cart_flu.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import ema_workbench.analysis.cart as cart diff --git a/ema_workbench/examples/sd_cart_wcm.py b/ema_workbench/examples/sd_cart_wcm.py index 2fefca6f1..37b3f98e9 100644 --- a/ema_workbench/examples/sd_cart_wcm.py +++ b/ema_workbench/examples/sd_cart_wcm.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import ema_workbench.analysis.cart as cart diff --git a/ema_workbench/examples/sd_dimensional_stacking_flu.py b/ema_workbench/examples/sd_dimensional_stacking_flu.py index c99883467..e90c30e62 100644 --- a/ema_workbench/examples/sd_dimensional_stacking_flu.py +++ b/ema_workbench/examples/sd_dimensional_stacking_flu.py @@ -7,6 +7,7 @@ .. codeauthor:: jhkwakkel """ + import matplotlib.pyplot as plt from ema_workbench import ema_logging, load_results diff --git a/ema_workbench/examples/sd_logit_flu_example.py b/ema_workbench/examples/sd_logit_flu_example.py index b3e8c999b..63ac24aec 100644 --- a/ema_workbench/examples/sd_logit_flu_example.py +++ b/ema_workbench/examples/sd_logit_flu_example.py @@ -1,6 +1,7 @@ """ """ + import matplotlib.pyplot as plt import seaborn as sns diff --git a/ema_workbench/examples/sd_prim_PCA_flu.py b/ema_workbench/examples/sd_prim_PCA_flu.py index c6d151c15..09d21a306 100644 --- a/ema_workbench/examples/sd_prim_PCA_flu.py +++ b/ema_workbench/examples/sd_prim_PCA_flu.py @@ -8,6 +8,7 @@ """ + import matplotlib.pyplot as plt import ema_workbench.analysis.prim as prim diff --git a/ema_workbench/examples/sd_prim_bryant_and_lempert.py b/ema_workbench/examples/sd_prim_bryant_and_lempert.py index 20d715cab..831521105 100644 --- a/ema_workbench/examples/sd_prim_bryant_and_lempert.py +++ b/ema_workbench/examples/sd_prim_bryant_and_lempert.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import pandas as pd diff --git a/ema_workbench/examples/sd_prim_constrained.py b/ema_workbench/examples/sd_prim_constrained.py index 226df67e3..5c3bc9608 100644 --- a/ema_workbench/examples/sd_prim_constrained.py +++ b/ema_workbench/examples/sd_prim_constrained.py @@ -5,6 +5,7 @@ approach for scenario discovery, doi: https://doi.org/10.1002/ffo2.8 """ + import matplotlib.pyplot as plt import pandas as pd diff --git a/ema_workbench/examples/sd_prim_flu.py b/ema_workbench/examples/sd_prim_flu.py index abb159103..975681abc 100644 --- a/ema_workbench/examples/sd_prim_flu.py +++ b/ema_workbench/examples/sd_prim_flu.py @@ -11,6 +11,7 @@ chamarat """ + import matplotlib.pyplot as plt import ema_workbench.analysis.prim as prim diff --git a/ema_workbench/examples/sd_prim_wcm.py b/ema_workbench/examples/sd_prim_wcm.py index 7e049670d..5bcd32d48 100644 --- a/ema_workbench/examples/sd_prim_wcm.py +++ b/ema_workbench/examples/sd_prim_wcm.py @@ -8,6 +8,7 @@ """ + import matplotlib.pyplot as plt from ema_workbench import ema_logging, load_results diff --git a/ema_workbench/examples/timeseries_clustering_flu.py b/ema_workbench/examples/timeseries_clustering_flu.py index b1dd8c024..d184bf7b1 100644 --- a/ema_workbench/examples/timeseries_clustering_flu.py +++ b/ema_workbench/examples/timeseries_clustering_flu.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import seaborn as sns diff --git a/ema_workbench/util/ema_logging.py b/ema_workbench/util/ema_logging.py index ca2f484c7..1b73fc469 100644 --- a/ema_workbench/util/ema_logging.py +++ b/ema_workbench/util/ema_logging.py @@ -6,6 +6,7 @@ This logging system will also work in case of multiprocessing. """ + import inspect import logging from contextlib import contextmanager diff --git a/test/models/Sales_Agent_Market_Building_Dynamics.py b/test/models/Sales_Agent_Market_Building_Dynamics.py index 3ec674320..063b16f64 100644 --- a/test/models/Sales_Agent_Market_Building_Dynamics.py +++ b/test/models/Sales_Agent_Market_Building_Dynamics.py @@ -2,6 +2,7 @@ Python model "Sales_Agent_Market_Building_Dynamics.py" Translated using PySD version 1.3.0 """ + from os import path import numpy as np diff --git a/test/models/Sales_Agent_Motivation_Dynamics.py b/test/models/Sales_Agent_Motivation_Dynamics.py index db1970ac0..7cb65bdef 100644 --- a/test/models/Sales_Agent_Motivation_Dynamics.py +++ b/test/models/Sales_Agent_Motivation_Dynamics.py @@ -2,6 +2,7 @@ Python model "Sales_Agent_Motivation_Dynamics.py" Translated using PySD version 1.3.0 """ + from os import path from pysd.py_backend.functions import lookup, Integ, if_then_else diff --git a/test/models/Teacup.py b/test/models/Teacup.py index 5495cd119..32a09b2d5 100644 --- a/test/models/Teacup.py +++ b/test/models/Teacup.py @@ -2,6 +2,7 @@ Python model "Teacup.py" Translated using PySD version 1.3.0 """ + from os import path from pysd.py_backend.functions import Integ diff --git a/test/test_analysis/test_b_and_w_plotting.py b/test/test_analysis/test_b_and_w_plotting.py index 5ae5e036c..6106e5b4d 100644 --- a/test/test_analysis/test_b_and_w_plotting.py +++ b/test/test_analysis/test_b_and_w_plotting.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import matplotlib.pyplot as plt import numpy as np diff --git a/test/test_analysis/test_cart.py b/test/test_analysis/test_cart.py index f4006a06b..5c0d83031 100644 --- a/test/test_analysis/test_cart.py +++ b/test/test_analysis/test_cart.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import unittest import numpy as np diff --git a/test/test_analysis/test_dimensional_stacking.py b/test/test_analysis/test_dimensional_stacking.py index a247a2281..5e5a75d89 100644 --- a/test/test_analysis/test_dimensional_stacking.py +++ b/test/test_analysis/test_dimensional_stacking.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import numpy as np import pandas as pd diff --git a/test/test_analysis/test_feature_scoring.py b/test/test_analysis/test_feature_scoring.py index f602348d1..6574aad87 100644 --- a/test/test_analysis/test_feature_scoring.py +++ b/test/test_analysis/test_feature_scoring.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import unittest import numpy as np diff --git a/test/test_analysis/test_logistic_regression.py b/test/test_analysis/test_logistic_regression.py index 3578c5604..1f15d95ee 100644 --- a/test/test_analysis/test_logistic_regression.py +++ b/test/test_analysis/test_logistic_regression.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import unittest import matplotlib.pyplot as plt diff --git a/test/test_analysis/test_pairs_plotting.py b/test/test_analysis/test_pairs_plotting.py index a18ebfe56..4a42ea87f 100644 --- a/test/test_analysis/test_pairs_plotting.py +++ b/test/test_analysis/test_pairs_plotting.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import matplotlib.pyplot as plt from ema_workbench.analysis.pairs_plotting import pairs_density, pairs_lines, pairs_scatter diff --git a/test/test_analysis/test_parcoords.py b/test/test_analysis/test_parcoords.py index a9a55516e..49cc14434 100644 --- a/test/test_analysis/test_parcoords.py +++ b/test/test_analysis/test_parcoords.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import matplotlib.pyplot as plt import pandas as pd diff --git a/test/test_analysis/test_plotting.py b/test/test_analysis/test_plotting.py index f1fba9451..13d094041 100644 --- a/test/test_analysis/test_plotting.py +++ b/test/test_analysis/test_plotting.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import unittest import matplotlib.pyplot as plt diff --git a/test/test_analysis/test_prim.py b/test/test_analysis/test_prim.py index 4897c77c7..7a4b3f408 100644 --- a/test/test_analysis/test_prim.py +++ b/test/test_analysis/test_prim.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import unittest import pytest diff --git a/test/test_analysis/test_regional_sa.py b/test/test_analysis/test_regional_sa.py index 81501b06b..9a57b81e8 100644 --- a/test/test_analysis/test_regional_sa.py +++ b/test/test_analysis/test_regional_sa.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import unittest import matplotlib.pyplot as plt diff --git a/test/test_analysis/test_scenario_discovery_util.py b/test/test_analysis/test_scenario_discovery_util.py index 210e05b58..d0d4d8f4e 100644 --- a/test/test_analysis/test_scenario_discovery_util.py +++ b/test/test_analysis/test_scenario_discovery_util.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import unittest import matplotlib.pyplot as plt diff --git a/test/test_connectors/test_netlogo.py b/test/test_connectors/test_netlogo.py index 81ab7fca4..3db134d05 100644 --- a/test/test_connectors/test_netlogo.py +++ b/test/test_connectors/test_netlogo.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import os import unittest from ema_workbench.connectors.netlogo import NetLogoModel diff --git a/test/test_connectors/test_pysd_interface.py b/test/test_connectors/test_pysd_interface.py index 35da55ef6..9242292eb 100644 --- a/test/test_connectors/test_pysd_interface.py +++ b/test/test_connectors/test_pysd_interface.py @@ -1,6 +1,7 @@ """ """ + import os import unittest diff --git a/test/test_connectors/test_vensim.py b/test/test_connectors/test_vensim.py index 0148e19ee..2fbc354f9 100644 --- a/test/test_connectors/test_vensim.py +++ b/test/test_connectors/test_vensim.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import os import unittest diff --git a/test/test_em_framework/test_callback.py b/test/test_em_framework/test_callback.py index 3e1124625..8787855b8 100644 --- a/test/test_em_framework/test_callback.py +++ b/test/test_em_framework/test_callback.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import random import pandas as pd diff --git a/test/test_em_framework/test_evaluators.py b/test/test_em_framework/test_evaluators.py index 6011e3035..3e80d458f 100644 --- a/test/test_em_framework/test_evaluators.py +++ b/test/test_em_framework/test_evaluators.py @@ -2,6 +2,7 @@ """ + import unittest.mock as mock import unittest diff --git a/test/test_em_framework/test_futures_ipyparallel.py b/test/test_em_framework/test_futures_ipyparallel.py index f6ecd70a9..fd8dc5018 100644 --- a/test/test_em_framework/test_futures_ipyparallel.py +++ b/test/test_em_framework/test_futures_ipyparallel.py @@ -4,6 +4,7 @@ taken from the ipyparallel test code with some minor adaptations .. codeauthor:: jhkwakkel """ + import logging import unittest.mock as mock diff --git a/test/test_em_framework/test_futures_multiprocessing.py b/test/test_em_framework/test_futures_multiprocessing.py index 6ccf3e4d2..5395156ac 100644 --- a/test/test_em_framework/test_futures_multiprocessing.py +++ b/test/test_em_framework/test_futures_multiprocessing.py @@ -2,6 +2,7 @@ """ + import unittest.mock as mock import unittest diff --git a/test/test_em_framework/test_model.py b/test/test_em_framework/test_model.py index 0f596c366..05fb78562 100644 --- a/test/test_em_framework/test_model.py +++ b/test/test_em_framework/test_model.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import unittest import unittest.mock as mock diff --git a/test/test_em_framework/test_optimization.py b/test/test_em_framework/test_optimization.py index a028835c4..873a8c575 100644 --- a/test/test_em_framework/test_optimization.py +++ b/test/test_em_framework/test_optimization.py @@ -3,7 +3,6 @@ """ - import unittest import unittest.mock as mock diff --git a/test/test_em_framework/test_outcomes.py b/test/test_em_framework/test_outcomes.py index fc6b1b87b..90b8d003a 100644 --- a/test/test_em_framework/test_outcomes.py +++ b/test/test_em_framework/test_outcomes.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import unittest import unittest.mock as mock diff --git a/test/test_em_framework/test_samplers.py b/test/test_em_framework/test_samplers.py index 0d4522b53..d6ab9d367 100644 --- a/test/test_em_framework/test_samplers.py +++ b/test/test_em_framework/test_samplers.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import unittest.mock as mock import unittest diff --git a/test/test_util/test_ema_logging.py b/test/test_util/test_ema_logging.py index 81e62e047..8a8851599 100644 --- a/test/test_util/test_ema_logging.py +++ b/test/test_util/test_ema_logging.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import logging import unittest diff --git a/test/test_util/test_utilities.py b/test/test_util/test_utilities.py index 30ed0e08a..28a134c88 100644 --- a/test/test_util/test_utilities.py +++ b/test/test_util/test_utilities.py @@ -3,6 +3,7 @@ .. codeauthor:: jhkwakkel """ + import os import unittest diff --git a/test/utilities.py b/test/utilities.py index 50e0cb930..2b0f2c02c 100644 --- a/test/utilities.py +++ b/test/utilities.py @@ -3,6 +3,7 @@ @author: jhkwakkel """ + import os from ema_workbench.util import load_results