Updates where old-style data file import was located

src/access_nri_intake/cli.py

@@ -4,6 +4,7 @@
 """ Command line interfaces for access-nri-intake """
 
 import argparse
+import importlib
 import logging
 import os
 import re
@@ -214,10 +215,12 @@ def _get_project(path):
     # Save the catalog
     cm.save()
 
-    _here = os.path.abspath(os.path.dirname(__file__))
     if update:
-        # FIXME use correct package data handling
-        with open(os.path.join(_here, "data", "catalog.yaml"), "w") as fobj:
+        with (
+            importlib.resources.files("access_nri_intake")
+            .joinpath("data/catalog.yaml")
+            .open(mode="w") as fobj
+        ):
             yaml.dump(yaml_dict, fobj)
 
 

src/access_nri_intake/data/__init__.py

@@ -1,10 +1,11 @@
 # Copyright 2023 ACCESS-NRI and contributors. See the top-level COPYRIGHT file for details.
 # SPDX-License-Identifier: Apache-2.0
 
-import os
+import importlib
 
 import intake
 
-## FIXME use correct package data handling
-_here = os.path.abspath(os.path.dirname(__file__))
-data = intake.open_catalog(os.path.join(_here, "catalog.yaml")).access_nri
+data = intake.open_catalog(
+    importlib.resources.files("access_nri_intake").joinpath("data/catalog.yaml")
+    # os.path.join(_here, "catalog.yaml")
+).access_nri