Skip to content

Commit 06b9200

Browse files
basnijholtbasnijholt
committed
adhere to PEP008 by using absolute imports
See https://www.python.org/dev/peps/pep-0008/#imports
1 parent 2f2e80d commit 06b9200

23 files changed

+92
-69
lines changed

‎adaptive/__init__.py‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
11
# -*- coding: utf-8 -*-
2+
23
from contextlib import suppress
34

4-
from .notebook_integration import (notebook_extension, live_plot,
5+
from adaptive.notebook_integration import (notebook_extension, live_plot,
56
active_plotting_tasks)
67

7-
from . import learner
8-
from . import runner
9-
from . import utils
8+
from adaptive import learner
9+
from adaptive import runner
10+
from adaptive import utils
1011

11-
from .learner import (BaseLearner, Learner1D, Learner2D, LearnerND,
12-
AverageLearner, BalancingLearner, make_datasaver,
13-
DataSaver, IntegratorLearner)
12+
from adaptive.learner import (
13+
BaseLearner, Learner1D, Learner2D, LearnerND,
14+
AverageLearner, BalancingLearner, make_datasaver,
15+
DataSaver, IntegratorLearner
16+
)
1417

1518
with suppress(ImportError):
1619
# Only available if 'scikit-optimize' is installed
17-
from .learner import SKOptLearner
20+
from adaptive.learner import SKOptLearner
1821

19-
from .runner import Runner, AsyncRunner, BlockingRunner
22+
from adaptive.runner import Runner, AsyncRunner, BlockingRunner
2023

21-
from ._version import __version__
24+
from adaptive._version import __version__
2225
del _version
2326

2427
del notebook_integration # to avoid confusion with `notebook_extension`

‎adaptive/learner/__init__.py‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# -*- coding: utf-8 -*-
2+
23
from contextlib import suppress
34

4-
from .average_learner import AverageLearner
5-
from .base_learner import BaseLearner
6-
from .balancing_learner import BalancingLearner
7-
from .learner1D import Learner1D
8-
from .learner2D import Learner2D
9-
from .learnerND import LearnerND
10-
from .integrator_learner import IntegratorLearner
11-
from .data_saver import DataSaver, make_datasaver
5+
from adaptive.learner.average_learner import AverageLearner
6+
from adaptive.learner.base_learner import BaseLearner
7+
from adaptive.learner.balancing_learner import BalancingLearner
8+
from adaptive.learner.learner1D import Learner1D
9+
from adaptive.learner.learner2D import Learner2D
10+
from adaptive.learner.learnerND import LearnerND
11+
from adaptive.learner.integrator_learner import IntegratorLearner
12+
from adaptive.learner.data_saver import DataSaver, make_datasaver
1213

1314
with suppress(ImportError):
1415
# Only available if 'scikit-optimize' is installed
15-
from .skopt_learner import SKOptLearner
16+
from adaptive.learner.skopt_learner import SKOptLearner

‎adaptive/learner/average_learner.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
# -*- coding: utf-8 -*-
2+
23
from math import sqrt
34

45
import numpy as np
56

6-
from .base_learner import BaseLearner
7-
from ..notebook_integration import ensure_holoviews
8-
from ..utils import cache_latest
7+
from adaptive.learner.base_learner import BaseLearner
8+
from adaptive.notebook_integration import ensure_holoviews
9+
from adaptive.utils import cache_latest
910

1011

1112
class AverageLearner(BaseLearner):

‎adaptive/learner/balancing_learner.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# -*- coding: utf-8 -*-
2+
23
from collections import defaultdict, Iterable
34
from contextlib import suppress
45
from functools import partial
@@ -7,9 +8,9 @@
78

89
import numpy as np
910

10-
from .base_learner import BaseLearner
11-
from ..notebook_integration import ensure_holoviews
12-
from ..utils import cache_latest, named_product, restore
11+
from adaptive.learner.base_learner import BaseLearner
12+
from adaptive.notebook_integration import ensure_holoviews
13+
from adaptive.utils import cache_latest, named_product, restore
1314

1415

1516
def dispatch(child_functions, arg):

‎adaptive/learner/base_learner.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# -*- coding: utf-8 -*-
2+
23
import abc
34
from contextlib import suppress
45
from copy import deepcopy
56

6-
from ..utils import save, load
7+
from adaptive.utils import save, load
78

89

910
class BaseLearner(metaclass=abc.ABCMeta):

‎adaptive/learner/data_saver.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# -*- coding: utf-8 -*-
2+
23
from collections import OrderedDict
34
import functools
45

5-
from .base_learner import BaseLearner
6-
from ..utils import copy_docstring_from
6+
from adaptive.learner.base_learner import BaseLearner
7+
from adaptive.utils import copy_docstring_from
78

89

910
class DataSaver:

‎adaptive/learner/integrator_learner.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
from scipy.linalg import norm
1111
from sortedcontainers import SortedSet
1212

13-
from .base_learner import BaseLearner
13+
from adaptive.learner.base_learner import BaseLearner
14+
from adaptive.notebook_integration import ensure_holoviews
15+
from adaptive.utils import cache_latest, restore
16+
1417
from .integrator_coeffs import (b_def, T_left, T_right, ns, hint,
1518
ndiv_max, min_sep, eps, xi, V_inv,
1619
Vcond, alpha, gamma)
17-
from ..notebook_integration import ensure_holoviews
18-
from ..utils import cache_latest, restore
1920

2021

2122
def _downdate(c, nans, depth):

‎adaptive/learner/learner1D.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# -*- coding: utf-8 -*-
2+
23
from copy import deepcopy
34
import heapq
45
import itertools
@@ -8,11 +9,11 @@
89
import numpy as np
910
import sortedcontainers
1011

11-
from .base_learner import BaseLearner
12-
from .learnerND import volume
13-
from .triangulation import simplex_volume_in_embedding
14-
from ..notebook_integration import ensure_holoviews
15-
from ..utils import cache_latest
12+
from adaptive.learner.base_learner import BaseLearner
13+
from adaptive.learner.learnerND import volume
14+
from adaptive.learner.triangulation import simplex_volume_in_embedding
15+
from adaptive.notebook_integration import ensure_holoviews
16+
from adaptive.utils import cache_latest
1617

1718

1819
def uses_nth_neighbors(n):

‎adaptive/learner/learner2D.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# -*- coding: utf-8 -*-
2+
23
from collections import OrderedDict
34
from copy import copy
45
import itertools
@@ -7,9 +8,9 @@
78
import numpy as np
89
from scipy import interpolate
910

10-
from .base_learner import BaseLearner
11-
from ..notebook_integration import ensure_holoviews
12-
from ..utils import cache_latest
11+
from adaptive.learner.base_learner import BaseLearner
12+
from adaptive.notebook_integration import ensure_holoviews
13+
from adaptive.utils import cache_latest
1314

1415

1516
# Learner2D and helper functions.

‎adaptive/learner/learnerND.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# -*- coding: utf-8 -*-
2+
23
from collections import OrderedDict, Iterable
34
import functools
45
import heapq
@@ -9,13 +10,13 @@
910
from scipy import interpolate
1011
import scipy.spatial
1112

12-
from .base_learner import BaseLearner
13-
14-
from ..notebook_integration import ensure_holoviews, ensure_plotly
15-
from .triangulation import (Triangulation, point_in_simplex,
16-
circumsphere, simplex_volume_in_embedding,
17-
fast_det)
18-
from ..utils import restore, cache_latest
13+
from adaptive.learner.base_learner import BaseLearner
14+
from adaptive.learner.triangulation import (
15+
Triangulation, point_in_simplex, circumsphere,
16+
simplex_volume_in_embedding, fast_det
17+
)
18+
from adaptive.notebook_integration import ensure_holoviews, ensure_plotly
19+
from adaptive.utils import restore, cache_latest
1920

2021

2122
def volume(simplex, ys=None):

0 commit comments

Comments
 (0)