Merge pull request #130 from patrick-kidger/test-tidy

patrick-kidger · web-flow · commit 287d0fefdbb9 · 2022-07-12T12:54:52.000+01:00
Tidied helper into a relative import
diff --git a/.isort.cfg b/.isort.cfg
@@ -4,4 +4,3 @@ lines_after_imports=2
 profile=black
 treat_comments_as_code=true
 default_section=FIRSTPARTY
-known_local_folder=helpers
diff --git a/test/__init__.py b/test/__init__.py
diff --git a/test/test_adjoint.py b/test/test_adjoint.py
@@ -6,7 +6,7 @@
 import jax.numpy as jnp
 import pytest
 
-from helpers import shaped_allclose
+from .helpers import shaped_allclose
 
 
 def test_no_adjoint():
diff --git a/test/test_bounded_while_loop.py b/test/test_bounded_while_loop.py
@@ -13,7 +13,7 @@
 import jax.random as jrandom
 import numpy as np
 
-from helpers import shaped_allclose, time_fn
+from .helpers import shaped_allclose, time_fn
 
 
 def test_functional_no_vmap_no_inplace():
diff --git a/test/test_detest.py b/test/test_detest.py
@@ -18,7 +18,7 @@
 import pytest
 import scipy.integrate as integrate
 
-from helpers import all_ode_solvers, shaped_allclose
+from .helpers import all_ode_solvers, shaped_allclose
 
 
 #
diff --git a/test/test_global_interpolation.py b/test/test_global_interpolation.py
@@ -7,7 +7,7 @@
 import jax.random as jrandom
 import pytest
 
-from helpers import all_ode_solvers, shaped_allclose
+from .helpers import all_ode_solvers, shaped_allclose
 
 
 @pytest.mark.parametrize("mode", ["linear", "linear2", "cubic"])
diff --git a/test/test_integrate.py b/test/test_integrate.py
@@ -10,7 +10,7 @@
 import scipy.stats
 from diffrax.misc import ω
 
-from helpers import all_ode_solvers, random_pytree, shaped_allclose, treedefs
+from .helpers import all_ode_solvers, random_pytree, shaped_allclose, treedefs
 
 
 def _all_pairs(*args):
diff --git a/test/test_interpolation.py b/test/test_interpolation.py
@@ -3,7 +3,7 @@
 import jax.numpy as jnp
 import jax.random as jrandom
 
-from helpers import all_ode_solvers, shaped_allclose
+from .helpers import all_ode_solvers, shaped_allclose
 
 
 def _test_path_derivative(path, name):
diff --git a/test/test_local_interpolation.py b/test/test_local_interpolation.py
@@ -2,7 +2,7 @@
 import jax
 import jax.numpy as jnp
 
-from helpers import shaped_allclose
+from .helpers import shaped_allclose
 
 
 def test_local_linear_interpolation():
diff --git a/test/test_misc.py b/test/test_misc.py
@@ -3,7 +3,7 @@
 import jax.numpy as jnp
 import pytest
 
-from helpers import random_pytree, shaped_allclose, treedefs
+from .helpers import random_pytree, shaped_allclose, treedefs
 
 
 def test_fill_forward():
diff --git a/test/test_newton_solver.py b/test/test_newton_solver.py
@@ -6,7 +6,7 @@
 import jax.numpy as jnp
 import jax.random as jrandom
 
-from helpers import shaped_allclose
+from .helpers import shaped_allclose
 
 
 # Basic test
diff --git a/test/test_saveat_solution.py b/test/test_saveat_solution.py
@@ -4,7 +4,7 @@
 import jax.numpy as jnp
 import pytest
 
-from helpers import shaped_allclose
+from .helpers import shaped_allclose
 
 
 def test_results():
diff --git a/test/test_step_to.py b/test/test_step_to.py
@@ -2,7 +2,7 @@
 import jax.numpy as jnp
 import pytest
 
-from helpers import shaped_allclose
+from .helpers import shaped_allclose
 
 
 def _test(ts, flip=False):
diff --git a/test/test_term.py b/test/test_term.py
@@ -6,7 +6,7 @@
 import jax.numpy as jnp
 import jax.random as jrandom
 
-from helpers import shaped_allclose
+from .helpers import shaped_allclose
 
 
 def test_ode_term():

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`import pytest`
`19`	`19`	`import scipy.integrate as integrate`
`20`	`20`
`21`		`-from helpers import all_ode_solvers, shaped_allclose`
	`21`	`+from .helpers import all_ode_solvers, shaped_allclose`
`22`	`22`
`23`	`23`
`24`	`24`	`#`