diff --git a/pytest.ini b/pytest.ini index b083fe9fd..cf0f0b500 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,2 @@ [pytest] -addopts = --ignore=pyxem/detectors/generic_flat_detector.py --ignore=pyxem/detectors/medipix_256x256.py --ignore=pyxem/detectors/medipix_515x515.py --ignore=pyxem/dummy_data/make_diffraction_test_data.py --ignore pyxem/signals/common_diffraction.py --ignore=pyxem/signals/diffraction2d.py --ignore=pyxem/signals/indexation_results.py --ignore=pyxem/utils/marker_tools.py --ignore=pyxem/utils/radial_utils.py +addopts = --ignore=pyxem/detectors/generic_flat_detector.py --ignore=pyxem/detectors/medipix_256x256.py --ignore=pyxem/detectors/medipix_515x515.py --ignore pyxem/signals/common_diffraction.py --ignore=pyxem/signals/diffraction2d.py --ignore=pyxem/signals/indexation_results.py --ignore=pyxem/utils/marker_tools.py diff --git a/pyxem/conftest.py b/pyxem/conftest.py index 74539548c..1fa24226a 100644 --- a/pyxem/conftest.py +++ b/pyxem/conftest.py @@ -11,6 +11,7 @@ def doctest_setup_teardown(request): plt.ioff() tmp_dir = TemporaryDirectory() + hs.preferences.General.show_progressbar = False org_dir = os.getcwd() os.chdir(tmp_dir.name) yield @@ -21,7 +22,6 @@ def doctest_setup_teardown(request): @pytest.fixture(autouse=True) def add_np_am(doctest_namespace): - hs.preferences.General.nb_progressbar = False doctest_namespace["np"] = numpy doctest_namespace["hs"] = hs doctest_namespace["pxm"] = pxm diff --git a/pyxem/dummy_data/make_diffraction_test_data.py b/pyxem/dummy_data/make_diffraction_test_data.py index d858507ea..961b91951 100644 --- a/pyxem/dummy_data/make_diffraction_test_data.py +++ b/pyxem/dummy_data/make_diffraction_test_data.py @@ -90,7 +90,7 @@ def _get_elliptical_ring(xx, yy, x, y, semi_len0, semi_len1, rotation, lw_r=1): Examples -------- >>> from hyperspy.signals import Signal2D - >>> from pyxem.dummy_data importmake_diffraction_test_data as mdtd + >>> from pyxem.dummy_data import make_diffraction_test_data as mdtd >>> s = Signal2D(np.zeros((110, 130))) >>> s.axes_manager[0].offset, s.axes_manager[1].offset = -50, -80 >>> xx, yy = np.meshgrid(