From 50d6b0d9f516fafc3fff655c1dd4cb82e2c0da24 Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Thu, 20 Jan 2022 13:49:34 +0000 Subject: [PATCH 1/3] tests: Warnings in tests fixed, conftest.py and pytest.ini removed --- conftest.py | 0 pytest.ini | 4 ---- tests/correlators_test.py | 8 +++----- 3 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 conftest.py delete mode 100644 pytest.ini diff --git a/conftest.py b/conftest.py deleted file mode 100644 index e69de29b..00000000 diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index 96153227..00000000 --- a/pytest.ini +++ /dev/null @@ -1,4 +0,0 @@ -[pytest] -filterwarnings = - ignore::RuntimeWarning:autograd.*: - ignore::RuntimeWarning:numdifftools.*: 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')]) From 0ed161f467f530931ca0f4be4439d1880f67a9a9 Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Thu, 20 Jan 2022 13:56:56 +0000 Subject: [PATCH 2/3] tests: conftest.py added --- conftest.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 conftest.py diff --git a/conftest.py b/conftest.py new file mode 100644 index 00000000..e69de29b From 1edd4ef91ab37333bbdec6346d170a1ed85ad8ba Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Thu, 20 Jan 2022 14:24:44 +0000 Subject: [PATCH 3/3] build: version number on develop branch changed to 2.0.0+dev --- pyerrors/version.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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',