remove black as a dependency (#1343)

* this change breaks API by removing
  the "asblack" functionality from
  all types

doc/pages/genetic_values.md

@@ -9,20 +9,20 @@ For some background, see {ref}`definitions`.
 
 ```{eval-rst}
 .. autoclass:: fwdpy11.Additive
-    :members: asdict, fromdict, asblack, shape, genetic_values, maps_to_fitness, maps_to_trait_value
+    :members: asdict, fromdict, shape, genetic_values, maps_to_fitness, maps_to_trait_value
 ```
 
 ```{eval-rst}
 .. autoclass:: fwdpy11.Multiplicative
-    :members: asdict, fromdict, asblack, shape, genetic_values, maps_to_fitness, maps_to_trait_value
+    :members: asdict, fromdict, shape, genetic_values, maps_to_fitness, maps_to_trait_value
 ```
 
 ```{eval-rst}
 .. autoclass:: fwdpy11.GBR
-    :members: asdict, fromdict, asblack, shape, genetic_values, maps_to_fitness, maps_to_trait_value
+    :members: asdict, fromdict, shape, genetic_values, maps_to_fitness, maps_to_trait_value
 ```
 
 ```{eval-rst}
 .. autoclass:: fwdpy11.AdditivePleiotropy
-    :members: asdict, fromdict, asblack, shape, genetic_values, maps_to_fitness, maps_to_trait_value
+    :members: asdict, fromdict, shape, genetic_values, maps_to_fitness, maps_to_trait_value
 ```

doc/pages/gvalue_to_fitness.md

@@ -15,12 +15,12 @@
 
 ```{eval-rst}
 .. autoclass:: fwdpy11.Optimum
-    :members: asdict, fromdict, asblack
+    :members: asdict, fromdict
 ```
 
 ```{eval-rst}
 .. autoclass:: fwdpy11.PleiotropicOptima
-    :members: asdict, fromdict, asblack
+    :members: asdict, fromdict
 ```
 
 

doc/pages/gvaluenoise.md

@@ -12,7 +12,7 @@
 
 ```{eval-rst}
 .. autoclass:: fwdpy11.GaussianNoise
-    :members: asdict, fromdict, asblack
+    :members: asdict, fromdict
 ```
 
 

doc/short_vignettes/mutationdominance_vignette.md

@@ -104,7 +104,7 @@ for s in np.arange(0.1, 1, 0.1):
 
 ```{code-cell}
 des = fwdpy11.DiscreteDESD(beg=0, end=1, weight=1, joint_dist=joint_dist)
-print(des.asblack())
+print(des)
 ```
 
 The result is that mutations with smaller effect sizes are more common (larger weights) and more dominant.

doc/short_vignettes/workingexample_fitness.md

@@ -40,7 +40,7 @@ params = fwdpy11.ModelParams(**p)
 Let's take a look at what he have:
 
 ```{code-cell}
-print(params.asblack())
+print(params)
 ```
 
 Let's explain a few new things:

doc/short_vignettes/workingexample_trait.md

@@ -44,7 +44,7 @@ params = fwdpy11.ModelParams(**p)
 ```
 
 ```{code-cell}
-print(params.asblack())
+print(params)
 ```
 
 ## Modifying model parameters

fwdpy11/_types/demographic_model_citation.py

@@ -3,13 +3,11 @@
 from deprecated import deprecated
 
 from fwdpy11.class_decorators import (
-    attr_add_asblack,
     attr_class_pickle,
     attr_class_to_from_dict,
 )
 
 
-@attr_add_asblack
 @attr_class_pickle
 @attr_class_to_from_dict
 @attr.s(kw_only=True, frozen=True, auto_attribs=True, repr_ns="fwdpy11")

fwdpy11/_types/demographic_model_details.py

@@ -4,7 +4,6 @@
 from deprecated import deprecated
 
 from ..class_decorators import (
-    attr_add_asblack,
     attr_class_pickle,
     attr_class_to_from_dict_no_recurse,
 )
@@ -14,7 +13,6 @@
 from .forward_demes_graph import ForwardDemesGraph
 
 
-@attr_add_asblack
 @attr_class_pickle
 @attr_class_to_from_dict_no_recurse
 @attr.s(kw_only=True, frozen=True, auto_attribs=True, repr_ns="fwdpy11")

fwdpy11/_types/model_params.py

@@ -26,15 +26,13 @@
 import fwdpy11
 import numpy as np
 from fwdpy11.class_decorators import (
-    attr_add_asblack,
     attr_class_to_from_dict_no_recurse,
 )
 
 from fwdpy11._types.demographic_model_details import DemographicModelDetails
 from fwdpy11._types.forward_demes_graph import ForwardDemesGraph
 
 
-@attr_add_asblack
 @attr_class_to_from_dict_no_recurse
 @attr.s(kw_only=True, frozen=True, slots=True, repr_ns="fwdpy11")
 class MutationAndRecombinationRates(object):
@@ -112,7 +110,6 @@ def validate_timings(
     return gvalue.validate_timings(deme, demography)
 
 
-@attr_add_asblack
 @attr_class_to_from_dict_no_recurse
 @attr.s(kw_only=True, frozen=True, slots=True, repr_ns="fwdpy11")
 class ModelParams(object):

fwdpy11/class_decorators.py

@@ -117,31 +117,6 @@ def setstate(self, d):
     return _add_getstate(cls)
 
 
-def attr_add_asblack(cls):
-    """
-    The default __repr__ from attrs isn't readable
-    for complex classes.  This adds a method
-    for pretty-printing out the class using black's
-    formatting rules
-    """
-
-    def _asblack(self):
-        """
-        Return a string representation formatted with black
-        """
-        import black
-
-        # The try/except is to handle black's changing API
-        try:
-            return black.format_str(str(self), mode=black.Mode())
-        except AttributeError:
-            return black.format_str(str(self), mode=black.FileMode())
-
-    cls.asblack = _asblack
-
-    return cls
-
-
 def region_custom_repr(cls):
     """
     Custom repr to correctly display weight for region instances

fwdpy11/genetic_map_unit.py

@@ -24,7 +24,6 @@
 import fwdpy11._fwdpy11
 
 from .class_decorators import (
-    attr_add_asblack,
     attr_class_pickle_with_super,
     attr_class_to_from_dict,
 )
@@ -35,7 +34,6 @@ def _is_integer_if_discrete(self, attribute, value):
         attr.validators.instance_of(int)(self, attribute, value)
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -90,7 +88,6 @@ def __attrs_post_init__(self):
         )
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -203,7 +200,6 @@ def __attrs_post_init__(self):
         )
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -257,7 +253,6 @@ def __attrs_post_init__(self):
         )
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -315,7 +310,6 @@ def __attrs_post_init__(self):
         )
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")

fwdpy11/genetic_values.py

@@ -43,7 +43,6 @@
     _PyDiploidGeneticValue,
 )
 from .class_decorators import (
-    attr_add_asblack,
     attr_class_pickle_with_super,
     attr_class_to_from_dict,
     attr_class_to_from_dict_no_recurse,
@@ -56,7 +55,6 @@ class TimingError(Exception):
     pass
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -96,7 +94,6 @@ def __attrs_post_init__(self):
         super(Optimum, self).__init__(self.optimum, self.VS, self.when)
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11", eq=False)
@@ -225,7 +222,6 @@ def validate_timings(self, deme: int, demography: ForwardDemesGraph) -> None:
                 raise TimingError(msg)
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -243,7 +239,6 @@ def __attrs_post_init__(self):
         super(NoNoise, self).__init__()
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -272,7 +267,6 @@ def __attrs_post_init__(self):
         super(GaussianNoise, self).__init__(self.sd, self.mean)
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict_no_recurse
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -324,7 +318,6 @@ def validate_timings(self, deme: int, demography: ForwardDemesGraph) -> None:
         self.gvalue_to_fitness.validate_timings(deme, demography)
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict_no_recurse
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -376,7 +369,6 @@ def validate_timings(self, deme: int, demography: ForwardDemesGraph) -> None:
         self.gvalue_to_fitness.validate_timings(deme, demography)
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict_no_recurse
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -417,7 +409,6 @@ def validate_timings(self, deme: int, demography: ForwardDemesGraph) -> None:
         self.gvalue_to_fitness.validate_timings(deme, demography)
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict_no_recurse
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")

fwdpy11/mutation_dominance.py

@@ -22,13 +22,11 @@
 import fwdpy11._fwdpy11
 
 from .class_decorators import (
-    attr_add_asblack,
     attr_class_to_from_dict,
     attr_class_pickle_with_super,
 )
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -48,7 +46,6 @@ def __attrs_post_init__(self):
         super(FixedDominance, self).__init__(fwdpy11._fwdpy11._fixed_dominance(self.h))
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -70,7 +67,6 @@ def __attrs_post_init__(self):
         )
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")
@@ -95,7 +91,6 @@ def __attrs_post_init__(self):
         )
 
 
-@attr_add_asblack
 @attr_class_pickle_with_super
 @attr_class_to_from_dict
 @attr.s(auto_attribs=True, frozen=True, repr_ns="fwdpy11")