add nan to dimensionless conversion

Author: esoteric-ephemera

mpcontribs-client/mpcontribs/client/__init__.py

@@ -1536,20 +1536,23 @@ def init_columns(
                     new_unit = new_column.get("unit", "NaN")
                     existing_unit = existing_column.get("unit")
                     if existing_unit != new_unit:
-                        conv_args = []
-                        for u in [existing_unit, new_unit]:
+                        if existing_unit == "NaN" and new_unit == "":
+                            factor = 1
+                        else:
+                            conv_args = []
+                            for u in [existing_unit, new_unit]:
+                                try:
+                                    conv_args.append(ureg.Unit(u))
+                                except ValueError:
+                                    raise MPContribsClientError(
+                                        f"Can't convert {existing_unit} to {new_unit} for {path}"
+                                    )
                             try:
-                                conv_args.append(ureg.Unit(u))
-                            except ValueError:
+                                factor = ureg.convert(1, *conv_args)
+                            except DimensionalityError:
                                 raise MPContribsClientError(
                                     f"Can't convert {existing_unit} to {new_unit} for {path}"
                                 )
-                        try:
-                            factor = ureg.convert(1, *conv_args)
-                        except DimensionalityError:
-                            raise MPContribsClientError(
-                                f"Can't convert {existing_unit} to {new_unit} for {path}"
-                            )
 
                         if not isclose(factor, 1):
                             logger.info(

mpcontribs-io/mpcontribs/io/__init__.py

@@ -0,0 +1,9 @@
+"""Set version for mpcontribs-io."""
+
+from importlib.metadata import version
+
+try:
+    __version__ = version("mpcontribs-io")
+except Exception:
+    # package is not installed
+    pass

mpcontribs-io/pyproject.toml

@@ -12,7 +12,7 @@ include-package-data = true
 [tool.setuptools.packages.find]
 where = ["."]
 exclude = ["scripts","supervisord"]
-include = ["mpcontribs.io.core","mpcontribs.io.archie"]
+include = ["mpcontribs.io"]
 
 [project]
 name = "mpcontribs-io"

mpcontribs-portal/mpcontribs/portal/__init__.py

@@ -0,0 +1,9 @@
+"""Set version for mpcontribs-portal."""
+
+from importlib.metadata import version
+
+try:
+    __version__ = version("mpcontribs-portal")
+except Exception:
+    # package is not installed
+    pass