Merge branch 'release/0.19.0'

ecmwf · Nov 20, 2023 · 7be631c · 7be631c
2 parents 1fad0dd + a4db36b
commit 7be631c
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 2,651 deletions.
diff --git a/climetlab/core/__init__.py b/climetlab/core/__init__.py
@@ -11,7 +11,7 @@
 from collections import defaultdict
 
 import climetlab
-from climetlab.loaders import build_remapping
+from climetlab.core.order import build_remapping
 
 LOG = logging.getLogger(__name__)
 

diff --git a/climetlab/core/index.py b/climetlab/core/index.py
@@ -15,9 +15,8 @@
 from collections import defaultdict
 
 import climetlab as cml
-from climetlab.core.order import normalize_order_by
+from climetlab.core.order import build_remapping, normalize_order_by
 from climetlab.core.select import normalize_selection
-from climetlab.loaders import build_remapping
 from climetlab.sources import Source
 
 LOG = logging.getLogger(__name__)

diff --git a/climetlab/indexing/database/sql.py b/climetlab/indexing/database/sql.py
@@ -19,8 +19,8 @@
 import numpy as np
 
 import climetlab as cml
+from climetlab.core.order import build_remapping
 from climetlab.indexing.database.json import json_serialiser
-from climetlab.loaders import build_remapping
 from climetlab.utils import tqdm
 from climetlab.utils.parts import Part