Update for compatibility with attrs v19.2

The deprecated `convert` argument is replaced by `converter`.

Author: ricklupton

floweaver/ordering.py

@@ -15,7 +15,7 @@ def _convert_layers(layers):
 
 @attr.s(slots=True, frozen=True, repr=False)
 class Ordering(object):
-    layers = attr.ib(convert=_convert_layers)
+    layers = attr.ib(converter=_convert_layers)
 
     def __repr__(self):
         def format_layer(layer):

floweaver/partition.py

@@ -9,13 +9,13 @@ def _validate_query(instance, attribute, value):
 
 @attr.s(slots=True, frozen=True)
 class Group(object):
-    label = attr.ib(convert=str)
-    query = attr.ib(convert=tuple, validator=_validate_query)
+    label = attr.ib(converter=str)
+    query = attr.ib(converter=tuple, validator=_validate_query)
 
 
 @attr.s(slots=True, frozen=True)
 class Partition(object):
-    groups = attr.ib(default=attr.Factory(tuple), convert=tuple)
+    groups = attr.ib(default=attr.Factory(tuple), converter=tuple)
 
     @property
     def labels(self):

floweaver/sankey_data.py

@@ -26,7 +26,7 @@ class SankeyData(object):
     nodes = attr.ib()
     links = attr.ib()
     groups = attr.ib(default=attr.Factory(list))
-    ordering = attr.ib(convert=_convert_ordering, default=Ordering([[]]))
+    ordering = attr.ib(converter=_convert_ordering, default=Ordering([[]]))
     dataset = attr.ib(default=None)
 
     def to_json(self, filename=None, format=None):
@@ -152,7 +152,7 @@ class SankeyLink(object):
     value = attr.ib(default=0.0)
     title = attr.ib(default=None, validator=_validate_opt_str)
     color = attr.ib(default=None, validator=_validate_opt_str)
-    opacity = attr.ib(default=1.0, convert=float, validator=_validate_opacity)
+    opacity = attr.ib(default=1.0, converter=float, validator=_validate_opacity)
     original_flows = attr.ib(default=attr.Factory(list))
 
     def to_json(self, format=None):

floweaver/sankey_definition.py

@@ -57,9 +57,9 @@ def _validate_ordering(instance, attribute, ordering):
 @attr.s(slots=True, frozen=True)
 class SankeyDefinition(object):
     nodes = attr.ib()
-    bundles = attr.ib(convert=_convert_bundles_to_dict,
+    bundles = attr.ib(converter=_convert_bundles_to_dict,
                       validator=_validate_bundles)
-    ordering = attr.ib(convert=_convert_ordering, validator=_validate_ordering)
+    ordering = attr.ib(converter=_convert_ordering, validator=_validate_ordering)
     flow_selection = attr.ib(default=None)
     flow_partition = attr.ib(default=None)
     time_partition = attr.ib(default=None)
@@ -169,7 +169,7 @@ class Bundle(object):
     """
     source = attr.ib()
     target = attr.ib()
-    waypoints = attr.ib(default=attr.Factory(tuple), convert=tuple)
+    waypoints = attr.ib(default=attr.Factory(tuple), converter=tuple)
     flow_selection = attr.ib(default=None, validator=_validate_flow_selection)
     flow_partition = attr.ib(default=None)
     default_partition = attr.ib(default=None)

setup.py

@@ -61,8 +61,8 @@ def find_version(*file_paths):
     install_requires=[
         'numpy',
         'pandas',
-        'attrs',
         'networkx >=2.1',
+        'attrs >=17.4',
         'palettable',
     ],
     extras_require={