From b5a40b260e7b2711470e94ee5ba170dd86f06af3 Mon Sep 17 00:00:00 2001 From: david hendriks <alien_blaster@hotmail.com> Date: Tue, 4 May 2021 11:10:19 +0100 Subject: [PATCH] Removing unnecessary imports --- binarycpython/tests/main.py | 1 + binarycpython/tests/test_grid_options_defaults.py | 13 ++++++++++--- binarycpython/tests/test_run_system_wrapper.py | 3 --- binarycpython/tests/test_spacing_functions.py | 8 +++++--- binarycpython/tests/test_stellar_types.py | 5 ----- binarycpython/tests/test_useful_funcs.py | 14 ++++++++++++-- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/binarycpython/tests/main.py b/binarycpython/tests/main.py index 2c8111696..4e6a1c292 100644 --- a/binarycpython/tests/main.py +++ b/binarycpython/tests/main.py @@ -4,6 +4,7 @@ Main file for the tests. This file imports all the combined_test functions from import unittest + from binarycpython.tests.test_c_bindings import * from binarycpython.tests.test_custom_logging import * from binarycpython.tests.test_distributions import * diff --git a/binarycpython/tests/test_grid_options_defaults.py b/binarycpython/tests/test_grid_options_defaults.py index bc9411761..a381f8036 100644 --- a/binarycpython/tests/test_grid_options_defaults.py +++ b/binarycpython/tests/test_grid_options_defaults.py @@ -1,11 +1,18 @@ """ Unittests for grid_options_defaults module """ - +import os import unittest -from binarycpython.utils.grid_options_defaults import * -from binarycpython.utils.functions import * +from binarycpython.utils.functions import ( + temp_dir, + Capturing, +) +from binarycpython.utils.grid_options_defaults import ( + write_grid_options_to_rst_file, + grid_options_help, + grid_options_description_checker +) binary_c_temp_dir = temp_dir() diff --git a/binarycpython/tests/test_run_system_wrapper.py b/binarycpython/tests/test_run_system_wrapper.py index f237693c9..ef4cc754d 100644 --- a/binarycpython/tests/test_run_system_wrapper.py +++ b/binarycpython/tests/test_run_system_wrapper.py @@ -2,7 +2,4 @@ Unittests for run_system_wrapper """ -from binarycpython.utils.run_system_wrapper import * -from binarycpython.utils.functions import * - # TODO: write tests for run_system_wrapper diff --git a/binarycpython/tests/test_spacing_functions.py b/binarycpython/tests/test_spacing_functions.py index bdfbe253e..b29290d0a 100644 --- a/binarycpython/tests/test_spacing_functions.py +++ b/binarycpython/tests/test_spacing_functions.py @@ -2,12 +2,11 @@ Unittests for spacing_functions module """ - import unittest import numpy as np -from binarycpython.utils.spacing_functions import * -from binarycpython.utils.functions import * +from binarycpython.utils.spacing_functions import const +from binarycpython.utils.functions import Capturing class test_spacing_functions(unittest.TestCase): """ @@ -28,3 +27,6 @@ class test_spacing_functions(unittest.TestCase): (const_return == np.linspace(1, 10, 10)).all(), msg="Output didn't contain SINGLE_STAR_LIFETIME", ) + +if __name__ == "__main__": + unittest.main() diff --git a/binarycpython/tests/test_stellar_types.py b/binarycpython/tests/test_stellar_types.py index 9ed515f7a..84d3e5ee3 100644 --- a/binarycpython/tests/test_stellar_types.py +++ b/binarycpython/tests/test_stellar_types.py @@ -1,8 +1,3 @@ """ Unittests for stellar_types module """ - -import unittest - -from binarycpython.utils.stellar_types import * -from binarycpython.utils.functions import * diff --git a/binarycpython/tests/test_useful_funcs.py b/binarycpython/tests/test_useful_funcs.py index 64531c4b3..9339d5459 100644 --- a/binarycpython/tests/test_useful_funcs.py +++ b/binarycpython/tests/test_useful_funcs.py @@ -5,8 +5,18 @@ Unittests for useful_funcs module import unittest import numpy as np -from binarycpython.utils.useful_funcs import * -from binarycpython.utils.functions import * +from binarycpython.utils.functions import ( + Capturing, +) + +from binarycpython.utils.useful_funcs import ( + zams_collision, + rzams, + roche_lobe, + ragb, + calc_sep_from_period, + calc_period_from_sep +) # class test_(unittest.TestCase): # """ -- GitLab