fix: don't drop nans too aggressively

Fixes #25

pyproject.toml

@@ -46,6 +46,13 @@ wellmap = "wellmap.plot:main"
 'Continuous Integration' = 'https://travis-ci.org/kalekundert/wellmap'
 'Test Coverage' = 'https://coveralls.io/github/kalekundert/wellmap'
 
+[tool.pytest.ini_options]
+filterwarnings = [
+    'ignore::DeprecationWarning',
+    'ignore:A private pytest class or function was used.:pytest.PytestDeprecationWarning',
+]
+addopts = "--doctest-glob='*.rst'"
+
 [tool.semantic_release]
 build_command = 'python -m pip install flit && flit build'
 version_variable = 'wellmap/__init__.py:__version__'

tests/test_plot.nt

@@ -166,6 +166,15 @@ test_show:
       > x = 'a'
       > y = 'c'
     expected: nan_first.png
+  -
+    id: nan-in-other-attr
+    layout:
+      > [well]
+      > A1.x = 1
+      > A2.y = 2
+      > A3.x = 3
+      > A3.y = 4
+    expected: nan_in_other_attr.png
   -
     id: skip-wells
     layout:

wellmap/file.py

@@ -275,7 +275,7 @@ def get_extras_kwarg():
         for path in layout['path'].unique():
             df = data_loader(path, **get_extras_kwarg())
             df['path'] = path
-            data = data.append(df, sort=False)
+            data = pd.concat([data, df], sort=False)
 
         ## Merge the layout and the data into a single data frame:
         if merge_cols is None:

wellmap/plot.py

@@ -455,8 +455,8 @@ class Colors:
 
     def __init__(self, cmap, df, attr):
         cols = ['plate', 'row_i', 'col_j']
-        labels = df\
-                .dropna()\
+        rows = df[attr].notna()
+        labels = df[rows]\
                 .sort_values(cols)\
                 .groupby(attr, sort=False)\
                 .head(1)