From d91676fe1b98ce328202a11d1f45794714b987ab Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 11 Feb 2022 22:36:46 +0000 Subject: [PATCH 1/3] removed unused imports --- openmc/plots.py | 2 -- openmc/tallies.py | 3 +-- tests/testing_harness.py | 2 -- tests/unit_tests/test_deplete_chain.py | 2 +- tests/unit_tests/test_deplete_operator.py | 2 -- tests/unit_tests/test_element_wo.py | 3 --- tests/unit_tests/test_lattice_discretization.py | 7 ------- tests/unit_tests/test_lib.py | 1 - tests/unit_tests/test_model.py | 1 - tests/unit_tests/test_plots.py | 1 - tests/unit_tests/test_source_file.py | 1 - tests/unit_tests/test_transfer_volumes.py | 5 +---- 12 files changed, 3 insertions(+), 27 deletions(-) diff --git a/openmc/plots.py b/openmc/plots.py index a430a945e..3599a3274 100644 --- a/openmc/plots.py +++ b/openmc/plots.py @@ -1,8 +1,6 @@ from collections.abc import Iterable, Mapping from numbers import Real, Integral from pathlib import Path -import shutil -import subprocess from xml.etree import ElementTree as ET import numpy as np diff --git a/openmc/tallies.py b/openmc/tallies.py index c7bc35933..dbcc6d55f 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -10,12 +10,11 @@ from xml.etree import ElementTree as ET import h5py import numpy as np import pandas as pd -from scipy.misc import derivative import scipy.sparse as sps import openmc import openmc.checkvalue as cv -from ._xml import clean_indentation, reorder_attributes, get_text +from ._xml import clean_indentation, reorder_attributes from .mixin import IDManagerMixin from .mesh import MeshBase diff --git a/tests/testing_harness.py b/tests/testing_harness.py index 92d34ccdc..ba65ba5a6 100644 --- a/tests/testing_harness.py +++ b/tests/testing_harness.py @@ -2,10 +2,8 @@ from difflib import unified_diff import filecmp import glob import hashlib -from optparse import OptionParser import os import shutil -import sys import numpy as np import openmc diff --git a/tests/unit_tests/test_deplete_chain.py b/tests/unit_tests/test_deplete_chain.py index 9769a49e3..4bfdaa63e 100644 --- a/tests/unit_tests/test_deplete_chain.py +++ b/tests/unit_tests/test_deplete_chain.py @@ -289,7 +289,7 @@ def test_get_set_chain_br(simple_chain): def test_capture_branch_infer_ground(): - """Ensure the ground state is infered if not given""" + """Ensure the ground state is inferred if not given""" # Make up a metastable capture transition: infer_br = {"Xe135": {"Xe136_m1": 0.5}} set_br = {"Xe135": {"Xe136": 0.5, "Xe136_m1": 0.5}} diff --git a/tests/unit_tests/test_deplete_operator.py b/tests/unit_tests/test_deplete_operator.py index 7d24f1428..5fe8715ac 100644 --- a/tests/unit_tests/test_deplete_operator.py +++ b/tests/unit_tests/test_deplete_operator.py @@ -4,8 +4,6 @@ Modifies and resets environment variable OPENMC_CROSS_SECTIONS to a custom file with new depletion_chain node """ -from os import environ -from unittest import mock from pathlib import Path import pytest diff --git a/tests/unit_tests/test_element_wo.py b/tests/unit_tests/test_element_wo.py index 2431f9e0e..52fc80a37 100644 --- a/tests/unit_tests/test_element_wo.py +++ b/tests/unit_tests/test_element_wo.py @@ -1,8 +1,5 @@ #!/usr/bin/env python -import os -import sys - import pytest from openmc import Material diff --git a/tests/unit_tests/test_lattice_discretization.py b/tests/unit_tests/test_lattice_discretization.py index b2766572d..388de982b 100644 --- a/tests/unit_tests/test_lattice_discretization.py +++ b/tests/unit_tests/test_lattice_discretization.py @@ -1,10 +1,3 @@ -from math import sqrt -import xml.etree.ElementTree as ET - -import openmc -import pytest - -from tests.unit_tests.test_lattice import zr, pincell1, pincell2, rlat2 def test_discretization_degenerate(rlat2): diff --git a/tests/unit_tests/test_lib.py b/tests/unit_tests/test_lib.py index e14e04adb..a0f18f851 100644 --- a/tests/unit_tests/test_lib.py +++ b/tests/unit_tests/test_lib.py @@ -1,5 +1,4 @@ from collections.abc import Mapping -from ctypes import ArgumentError import os import numpy as np diff --git a/tests/unit_tests/test_model.py b/tests/unit_tests/test_model.py index 80c13fe61..ff446a83d 100644 --- a/tests/unit_tests/test_model.py +++ b/tests/unit_tests/test_model.py @@ -1,6 +1,5 @@ from math import pi from pathlib import Path -from shutil import which import numpy as np import pytest diff --git a/tests/unit_tests/test_plots.py b/tests/unit_tests/test_plots.py index b55dbe9be..3288617b0 100644 --- a/tests/unit_tests/test_plots.py +++ b/tests/unit_tests/test_plots.py @@ -1,4 +1,3 @@ -import numpy as np import openmc import openmc.examples import pytest diff --git a/tests/unit_tests/test_source_file.py b/tests/unit_tests/test_source_file.py index 8166f5712..1398088e5 100644 --- a/tests/unit_tests/test_source_file.py +++ b/tests/unit_tests/test_source_file.py @@ -1,5 +1,4 @@ from random import random -import subprocess import h5py import numpy as np diff --git a/tests/unit_tests/test_transfer_volumes.py b/tests/unit_tests/test_transfer_volumes.py index c048778bd..e1f3c1053 100644 --- a/tests/unit_tests/test_transfer_volumes.py +++ b/tests/unit_tests/test_transfer_volumes.py @@ -1,7 +1,4 @@ -"""Regression tests for openmc.deplete.Results.transfer_volumes method. - - -""" +"""Regression tests for openmc.deplete.Results.transfer_volumes method.""" from pytest import approx import openmc From 0108947e703e111e93e3f48801cc5887eed37e5a Mon Sep 17 00:00:00 2001 From: Jonathan Date: Fri, 11 Feb 2022 23:46:24 +0000 Subject: [PATCH 2/3] returned used import --- tests/unit_tests/test_lattice_discretization.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/unit_tests/test_lattice_discretization.py b/tests/unit_tests/test_lattice_discretization.py index 388de982b..483cc111b 100644 --- a/tests/unit_tests/test_lattice_discretization.py +++ b/tests/unit_tests/test_lattice_discretization.py @@ -1,4 +1,6 @@ +from tests.unit_tests.test_lattice import rlat2 + def test_discretization_degenerate(rlat2): From 6257c61c1cfbc3033f54e714dfed669708b913de Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sat, 12 Feb 2022 00:54:21 +0000 Subject: [PATCH 3/3] Adding a few more imports back --- tests/unit_tests/test_lattice_discretization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit_tests/test_lattice_discretization.py b/tests/unit_tests/test_lattice_discretization.py index 483cc111b..b21d7e13e 100644 --- a/tests/unit_tests/test_lattice_discretization.py +++ b/tests/unit_tests/test_lattice_discretization.py @@ -1,5 +1,5 @@ -from tests.unit_tests.test_lattice import rlat2 +from tests.unit_tests.test_lattice import zr, pincell1, pincell2, rlat2 def test_discretization_degenerate(rlat2):