Merge branch 'master' into fix/windows-path-join-plasmodium

Author: jonbrenas

malariagen_data/anoph/dipclust.py

@@ -542,10 +542,10 @@ def _dipclust_concat_subplots(
             if isinstance(figure, go.Figure):
                 # This is a figure, access the traces within it.
                 for trace in range(len(figure["data"])):
-                    fig.append_trace(figure["data"][trace], row=i + 1, col=1)
+                    fig.add_trace(figure["data"][trace], row=i + 1, col=1)
             else:
                 # Assume this is a trace, add directly.
-                fig.append_trace(figure, row=i + 1, col=1)
+                fig.add_trace(figure, row=i + 1, col=1)
 
         fig.update_xaxes(visible=False)
         fig.update_layout(

malariagen_data/anoph/sample_metadata.py

@@ -1569,11 +1569,11 @@ def plot_sample_location_mapbox(
         # Sort by `color` column by default, which can be overridden via category_orders.
         df_locations = df_samples[location_columns].drop_duplicates().sort_values(color)
 
-        fig = px.scatter_mapbox(
+        fig = px.scatter_map(
             df_locations,
             lat="latitude",
             lon="longitude",
-            mapbox_style="open-street-map",
+            map_style="open-street-map",
             zoom=zoom,
             color=color,
             category_orders=category_orders,

pyproject.toml

@@ -6,15 +6,10 @@ readme = "README.md"
 documentation = "https://malariagen.github.io/malariagen-data-python/latest/"
 repository = "https://github.com/malariagen/malariagen-data-python"
 authors = [
-    "Alistair Miles <alistair.miles@sanger.ac.uk>",
-    "Chris Clarkson <chris.clarkson@sanger.ac.uk>",
-    "Anastasia Hernandez-Koutoucheva <ah32@sanger.ac.uk>",
-    "Lee Hart <lee.hart@sanger.ac.uk>",
-    "Kathryn Murie <km22@sanger.ac.uk>",
-    "Nace Kranjc <n.kranjc@imperial.ac.uk>",
-    "Kelly Bennett <kb25@sanger.ac.uk>",
-    "Jon Brenas <jb52@sanger.ac.uk>",
-    "Sanjay Nagi <sanjay.nagi@lstmed.ac.uk>",
+    "Chris Clarkson <Chris.Clarkson@lstmed.ac.uk>",
+    "Anastasia Hernandez-Koutoucheva <Anastasia.Hernandez-Koutoucheva@lstmed.ac.uk>",
+    "Kelly Bennett <Kelly.Bennett@lstmed.ac.uk>",
+    "Jon Brenas <Jon.Brenas@lstmed.ac.uk>",
     "Tristan Dennis <Tristan.Dennis@lstmed.ac.uk>",
 ]
 license = "MIT"