diff --git a/notebooks/viewf_theory.ipynb b/notebooks/viewf_theory.ipynb index bbb6b3c..1e84f34 100644 --- a/notebooks/viewf_theory.ipynb +++ b/notebooks/viewf_theory.ipynb @@ -188,6 +188,13 @@ "\n", "plt.show()\n" ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { diff --git a/setup.py b/setup.py index 9a75d63..b9ca1a6 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ "hor1d.c", ]], include_dirs=[numpy.get_include()], - # define_macros=[('NPY_NO_DEPRECATED_API', 'NPY_1_7_API_VERSION')], # extra_compile_args=['-O3'], # extra_link_args=['-O3'], directives={'linetrace': False, 'language_level': 3} diff --git a/topocalc/tests/test_viewf.py b/topocalc/tests/test_viewf.py index f99457e..753cc88 100644 --- a/topocalc/tests/test_viewf.py +++ b/topocalc/tests/test_viewf.py @@ -19,9 +19,9 @@ def test_theory_edge(self): svf, tvf = viewf(dem, spacing=10) # The top should all be ones with 100% sky view - self.assertTrue( - np.array_equal(svf[:, :24], - np.ones_like(svf[:, :24])) + np.testing.assert_equal( + svf[:, :24], + np.ones_like(svf[:, :24]) ) # The edge should be 50% or 0.5 svf @@ -39,7 +39,8 @@ def test_viewf_errors_dem(self): def test_viewf_errors_angles(self): """Test viewf nangles errors""" - self.assertRaises(ValueError, viewf, np.ones((10, 1)), 10, nangles=10) + self.assertRaises(ValueError, viewf, np.ones( + (10, 1)), 10, nangles=10) def test_viewf_errors_sin_slope(self): """Test viewf sin_slope errors"""