Use isort instead of asottile's reorder-python-imports

.pre-commit-config.yaml

@@ -41,12 +41,19 @@ repos:
       - id: python-no-log-warn
       - id: python-use-type-annotations
       - id: text-unicode-replacement-char
-  - repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.13.0
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2
     hooks:
-      - id: reorder-python-imports
+      - id: isort
+        name: isort
         args:
-          - --py37-plus
+          - --profile=black
+  # - repo: https://github.com/asottile/reorder-python-imports
+  #   rev: v3.13.0
+  #   hooks:
+  #     - id: reorder-python-imports
+  #       args:
+  #         - --py37-plus
   - repo: https://github.com/asottile/setup-cfg-fmt
     rev: v2.5.0
     hooks:

src/upper_envelope/__init__.py

@@ -1,4 +1,2 @@
-from upper_envelope.fues_jax.fues_jax import fues_jax
-from upper_envelope.fues_jax.fues_jax import fues_jax_unconstrained
-from upper_envelope.fues_numba.fues_numba import fues_numba
-from upper_envelope.fues_numba.fues_numba import fues_numba_unconstrained
+from upper_envelope.fues_jax.fues_jax import fues_jax, fues_jax_unconstrained
+from upper_envelope.fues_numba.fues_numba import fues_numba, fues_numba_unconstrained

src/upper_envelope/fues_jax/check_and_scan_funcs.py

@@ -3,6 +3,7 @@
 
 import jax
 from jax import numpy as jnp
+
 from upper_envelope.math_funcs import calc_gradient
 
 

src/upper_envelope/fues_jax/fues_jax.py

@@ -7,21 +7,17 @@
 """
 
 from functools import partial
-from typing import Callable
-from typing import Dict
-from typing import Optional
-from typing import Tuple
+from typing import Callable, Dict, Optional, Tuple
 
 import jax
 import jax.numpy as jnp
 import numpy as np
 from jax import vmap
+
 from upper_envelope.fues_jax.check_and_scan_funcs import (
     determine_cases_and_conduct_necessary_scans,
 )
-from upper_envelope.math_funcs import (
-    calc_intersection_and_extrapolate_policy,
-)
+from upper_envelope.math_funcs import calc_intersection_and_extrapolate_policy
 
 
 @partial(

src/upper_envelope/fues_numba/fues_numba.py

@@ -6,9 +6,7 @@
 
 """
 
-from typing import Callable
-from typing import Optional
-from typing import Tuple
+from typing import Callable, Optional, Tuple
 
 import numpy as np
 from numba import njit

tests/test_fues_jax.py

@@ -7,13 +7,15 @@
 import jax.numpy as jnp
 import numpy as np
 import pytest
-import upper_envelope as upenv
 from numpy.testing import assert_array_almost_equal as aaae
-from upper_envelope.fues_jax.check_and_scan_funcs import back_and_forward_scan_wrapper
 
-from tests.utils.interpolation import interpolate_policy_and_value_on_wealth_grid
-from tests.utils.interpolation import linear_interpolation_with_extrapolation
+import upper_envelope as upenv
+from tests.utils.interpolation import (
+    interpolate_policy_and_value_on_wealth_grid,
+    linear_interpolation_with_extrapolation,
+)
 from tests.utils.upper_envelope_fedor import upper_envelope
+from upper_envelope.fues_jax.check_and_scan_funcs import back_and_forward_scan_wrapper
 
 jax.config.update("jax_enable_x64", True)
 

tests/test_fues_numba.py

@@ -4,12 +4,14 @@
 
 import numpy as np
 import pytest
-import upper_envelope as upenv
 from numpy.testing import assert_array_almost_equal as aaae
 
+import upper_envelope as upenv
 from tests.utils.fast_upper_envelope_org import fast_upper_envelope_wrapper_org
-from tests.utils.interpolation import interpolate_single_policy_and_value_on_wealth_grid
-from tests.utils.interpolation import linear_interpolation_with_extrapolation
+from tests.utils.interpolation import (
+    interpolate_single_policy_and_value_on_wealth_grid,
+    linear_interpolation_with_extrapolation,
+)
 from tests.utils.upper_envelope_fedor import upper_envelope
 
 # Obtain the test directory of the package.

tests/utils/fast_upper_envelope_org.py

@@ -5,9 +5,7 @@
 https://dx.doi.org/10.2139/ssrn.4181302
 
 """
-from typing import Callable
-from typing import Optional
-from typing import Tuple
+from typing import Callable, Optional, Tuple
 
 import numpy as np
 

tests/utils/upper_envelope_fedor.py

@@ -5,15 +5,11 @@
 
 """
 
-from typing import Callable
-from typing import Dict
-from typing import List
-from typing import Tuple
+from typing import Callable, Dict, List, Tuple
 
 import numpy as np
 from scipy.optimize import brenth as root
 
-
 EPS = 2.2204e-16