diff --git a/pyerrors/version.py b/pyerrors/version.py index 8c0d5d5b..1452f094 100644 --- a/pyerrors/version.py +++ b/pyerrors/version.py @@ -1 +1 @@ -__version__ = "2.0.0" +__version__ = "2.0.0+dev" diff --git a/setup.py b/setup.py index 5a971d92..cef96ece 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages setup(name='pyerrors', - version='2.0.0', + version='2.0.0+dev', description='Error analysis for lattice QCD', author='Fabian Joswig', author_email='fabian.joswig@ed.ac.uk', diff --git a/tests/correlators_test.py b/tests/correlators_test.py index 55d0a977..c8f57d75 100644 --- a/tests/correlators_test.py +++ b/tests/correlators_test.py @@ -38,9 +38,6 @@ def test_function_overloading(): np.arccosh(corr_a + 1.1) np.arctanh(corr_a) - with pytest.raises(Exception): - np.arccosh(corr_a) - def test_modify_correlator(): corr_content = [] @@ -64,12 +61,13 @@ def test_modify_correlator(): def test_m_eff(): - my_corr = pe.correlators.Corr([pe.pseudo_Obs(10, 0.1, 't'), pe.pseudo_Obs(9, 0.05, 't'), pe.pseudo_Obs(8, 0.1, 't'), pe.pseudo_Obs(7, 0.05, 't')]) + my_corr = pe.correlators.Corr([pe.pseudo_Obs(10, 0.1, 't'), pe.pseudo_Obs(9, 0.05, 't'), pe.pseudo_Obs(9, 0.1, 't'), pe.pseudo_Obs(10, 0.05, 't')]) my_corr.m_eff('log') my_corr.m_eff('cosh') - my_corr.m_eff('sinh') my_corr.m_eff('arccosh') + with pytest.warns(RuntimeWarning): + my_corr.m_eff('sinh') def test_reweighting(): my_corr = pe.correlators.Corr([pe.pseudo_Obs(10, 0.1, 't'), pe.pseudo_Obs(0, 0.05, 't')])