diff --git a/binarycpython/tests/test_c_bindings.py b/binarycpython/tests/test_c_bindings.py index d92d449682bdded20d9e06e2e7b4fcca394a7c37..b231189ae81b36a5f233dcba1b7d88c4ddefc9a2 100644 --- a/binarycpython/tests/test_c_bindings.py +++ b/binarycpython/tests/test_c_bindings.py @@ -13,16 +13,22 @@ import numpy as np from binarycpython import _binary_c_bindings from binarycpython.utils.functions import ( - binarycDecoder, temp_dir, - inspect_dict, - merge_dicts, - handle_ensemble_string_to_json, verbose_print, - extract_ensemble_json_from_string, is_capsule, Capturing, ) +from binarycpython.utils.ensemble import ( + binarycDecoder, + handle_ensemble_string_to_json, + extract_ensemble_json_from_string, +) +from binarycpython.utils.dicts import ( + inspect_dict, + merge_dicts, +) + + TMP_DIR = temp_dir("tests", "test_c_bindings") diff --git a/binarycpython/tests/test_functions.py b/binarycpython/tests/test_functions.py index 069f6094b07bf3279fc29964847220cd5ba0c703..2b37f89250ac101cf9b475a43095bc0595d2934d 100644 --- a/binarycpython/tests/test_functions.py +++ b/binarycpython/tests/test_functions.py @@ -6,10 +6,46 @@ import os import unittest import tempfile -from binarycpython.utils.custom_logging_functions import binary_c_log_code -from binarycpython.utils.run_system_wrapper import run_system - -from binarycpython.utils.functions import * +import json +import h5py + +from binarycpython.utils.custom_logging_functions import ( + binary_c_log_code +) +from binarycpython.utils.run_system_wrapper import ( + run_system +) +from binarycython.utils.functions import ( + temp_dir, + Capturing, + verbose_print, + remove_file, + get_username, + bin_data, + create_hdf5, + return_binary_c_version_info, + parse_binary_c_version_info, + output_lines, + get_defaults, + example_parse_output, + create_arg_string, + get_arg_keys, + get_help, + get_help_all, + get_help_super, + write_binary_c_parameter_descriptions_to_rst_file, + make_build_text +) +from binarycpython.utils.dicts import ( + AutoVivificationDict, + inspect_dict, + merge_dicts +) +from binarcpython.utils.ensemble import ( + binaryc_json_serializer, + handle_ensemble_string_to_json + +) TMP_DIR = temp_dir("tests", "test_functions") @@ -723,7 +759,7 @@ class test_merge_dicts(unittest.TestCase): self.assertTrue(output_dict["bool"]) def test_ints(self): - with Capturing() as output: + with Capturing() as _: self._test_ints() def _test_ints(self): @@ -758,7 +794,7 @@ class test_merge_dicts(unittest.TestCase): with Capturing() as output: self._test_lists() - def test_lists(self): + def _test_lists(self): """ Test merging dict with lists """ @@ -771,7 +807,7 @@ class test_merge_dicts(unittest.TestCase): self.assertEqual(output_dict["list"], [1, 2, 3, 4]) def test_dicts(self): - with Capturing() as output: + with Capturing() as _: self._test_dicts() def _test_dicts(self): @@ -842,7 +878,7 @@ class test_handle_ensemble_string_to_json(unittest.TestCase): """ def test_1(self): - with Capturing() as output: + with Capturing() as _: self._test_1() def _test_1(self): @@ -850,7 +886,7 @@ class test_handle_ensemble_string_to_json(unittest.TestCase): Test passing string representation of a dictionary. """ - string_of_function = str(os.path.isfile) + _ = str(os.path.isfile) input_string = '{"ding": 10, "list_example": [1,2,3]}' output_dict = handle_ensemble_string_to_json(input_string) diff --git a/binarycpython/tests/test_grid.py b/binarycpython/tests/test_grid.py index 8f79bd6b917562ecca2b991e985a988feb8e9c1b..21acc368846b47dd61f62c99e7560db1d2025013 100644 --- a/binarycpython/tests/test_grid.py +++ b/binarycpython/tests/test_grid.py @@ -12,14 +12,21 @@ import unittest import numpy as np from binarycpython.utils.grid import Population + from binarycpython.utils.functions import ( temp_dir, - extract_ensemble_json_from_string, - merge_dicts, remove_file, Capturing, bin_data, ) + +from binarycpython.utils.ensemble import ( + extract_ensemble_json_from_string, +) +from binarycpython.utils.dicts import ( + merge_dicts, +) + from binarycpython.utils.custom_logging_functions import binary_c_log_code TMP_DIR = temp_dir("tests", "test_grid") diff --git a/binarycpython/utils/ensemble.py b/binarycpython/utils/ensemble.py index 6b2a0ab3b5ab4bb2b86ba7f988c288f4bb0e7964..78e824d6d3145151b43492291f8f9fb660c2b065 100644 --- a/binarycpython/utils/ensemble.py +++ b/binarycpython/utils/ensemble.py @@ -4,46 +4,32 @@ population ensemble using the binarycpython package """ -import astropy.units as u -import binarycpython.utils.moe_di_stefano_2017_data as moe_di_stefano_2017_data -from binarycpython import _binary_c_bindings -from binarycpython.utils.dicts import ( - keys_to_floats, - recursive_change_key_to_float, - custom_sort_dict, - recursive_change_key_to_string, -) + import bz2 -import collections -from colorama import Fore, Back, Style -import copy -import datetime as dt +import time + +from typing import Any import gc import gzip -from halo import Halo -import h5py -import humanize import inspect -from io import StringIO -import json + + +from halo import Halo import msgpack -import numpy as np -import os -import psutil import py_rinterpolate -import re -import resource -import sys -import subprocess -import tempfile -import time -import types -from typing import Union, Any import simplejson # import orjson +from colorama import Fore, Back, Style + +from binarycpython.utils.dicts import ( + keys_to_floats, + recursive_change_key_to_float, + custom_sort_dict, + recursive_change_key_to_string, +) def ensemble_setting(ensemble, parameter_name): """