From 3310904b5327d830afbac3d798d540471e218bf4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 20:04:44 +0000 Subject: [PATCH 1/3] Bump flake8 from 6.1.0 to 7.0.0 Bumps [flake8](https://github.com/pycqa/flake8) from 6.1.0 to 7.0.0. - [Commits](https://github.com/pycqa/flake8/compare/6.1.0...7.0.0) --- updated-dependencies: - dependency-name: flake8 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- install/testing_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/testing_requirements.txt b/install/testing_requirements.txt index 2d72c85dec..c1dff2148f 100644 --- a/install/testing_requirements.txt +++ b/install/testing_requirements.txt @@ -1,4 +1,4 @@ -flake8==6.1.0 +flake8==7.0.0 coverage==7.3.1 pytest==7.4.4 pytest-cov==4.1.0 From 39e9c266706d5fbf1093b3f4c7d1de188bef7fb9 Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Fri, 5 Jan 2024 14:30:03 -0600 Subject: [PATCH 2/3] Removing link --- examples/calling_scripts/tutorial_calling.py | 1 - 1 file changed, 1 deletion(-) delete mode 120000 examples/calling_scripts/tutorial_calling.py diff --git a/examples/calling_scripts/tutorial_calling.py b/examples/calling_scripts/tutorial_calling.py deleted file mode 120000 index f54fe1ad73..0000000000 --- a/examples/calling_scripts/tutorial_calling.py +++ /dev/null @@ -1 +0,0 @@ -../tutorials/simple_sine/tutorial_calling.py \ No newline at end of file From c8e2e944f0b53cf334c045f08d82135df107cffa Mon Sep 17 00:00:00 2001 From: Jeffrey Larson Date: Fri, 5 Jan 2024 14:30:30 -0600 Subject: [PATCH 3/3] black --- libensemble/gen_funcs/persistent_gpCAM.py | 1 - .../tests/functionality_tests/test_uniform_sampling.py | 5 ++--- libensemble/tests/regression_tests/common.py | 1 + libensemble/tests/unit_tests/test_platform.py | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libensemble/gen_funcs/persistent_gpCAM.py b/libensemble/gen_funcs/persistent_gpCAM.py index 05469a1ef1..cf4cc3f0f9 100644 --- a/libensemble/gen_funcs/persistent_gpCAM.py +++ b/libensemble/gen_funcs/persistent_gpCAM.py @@ -61,7 +61,6 @@ def persistent_gpCAM_simple(H_in, persis_info, gen_specs, libE_info): tag = None persis_info["max_variance"] = [] while tag not in [STOP_TAG, PERSIS_STOP]: - if all_x.shape[0] == 0: x_new = persis_info["rand_stream"].uniform(lb, ub, (batch_size, n)) else: diff --git a/libensemble/tests/functionality_tests/test_uniform_sampling.py b/libensemble/tests/functionality_tests/test_uniform_sampling.py index e9c1470834..9af49f0b9a 100644 --- a/libensemble/tests/functionality_tests/test_uniform_sampling.py +++ b/libensemble/tests/functionality_tests/test_uniform_sampling.py @@ -23,10 +23,10 @@ # Import libEnsemble items for this test from libensemble.libE import libE -from libensemble.sim_funcs.six_hump_camel import six_hump_camel from libensemble.sim_funcs.mock_sim import mock_sim -from libensemble.tests.regression_tests.support import six_hump_camel_minima as minima +from libensemble.sim_funcs.six_hump_camel import six_hump_camel from libensemble.tests.regression_tests.common import read_generated_file +from libensemble.tests.regression_tests.support import six_hump_camel_minima as minima from libensemble.tools import add_unique_random_streams, parse_args # Main block is necessary only when using local comms with spawn start method (default on macOS and Windows). @@ -60,7 +60,6 @@ exit_criteria = {"gen_max": 501, "wallclock_max": 300} for run in range(2): - if run == 1: # Test running a mock sim using previous history file sim_specs["sim_f"] = mock_sim diff --git a/libensemble/tests/regression_tests/common.py b/libensemble/tests/regression_tests/common.py index 7c0ff500f2..cb174d09c9 100644 --- a/libensemble/tests/regression_tests/common.py +++ b/libensemble/tests/regression_tests/common.py @@ -10,6 +10,7 @@ class FileNotFoundError(Exception): """Exception raised when a file is not found within the specified timeout.""" + pass diff --git a/libensemble/tests/unit_tests/test_platform.py b/libensemble/tests/unit_tests/test_platform.py index d5251123fb..fef454397d 100644 --- a/libensemble/tests/unit_tests/test_platform.py +++ b/libensemble/tests/unit_tests/test_platform.py @@ -14,7 +14,7 @@ "cores_per_node": 42, "logical_cores_per_node": 168, "gpus_per_node": 6, - 'tiles_per_gpu': None, + "tiles_per_gpu": None, "gpu_setting_type": "option_gpus_per_task", "gpu_setting_name": "-g", "scheduler_match_slots": False,