Bugfix: disable automatic node label font size rescaling if the fontsize is specified using the fontsize keyword

Previously, only the `size` keyword resulted in the correct
behaviour.

Author: paulbrodersen

README.md

@@ -105,6 +105,8 @@ help(EditableGraph)
 
 ## Recent changes
 
+- 4.12.10 Fixed a bug with automatic node label rescaling if the node label fontsize was specified using the `fontsize` keyword argument (instead of just `size`).
+- 4.12.9 Fixed a bug that occurred when the distance argument to `_shorten_line_by` was equal or smaller than zero.
 - 4.12.8 Fixed a bug that occurred with recent numpy versions when using multi-partite or shell layouts with un-equal numbers of nodes in each layer (issue #65).
 - 4.12.7 Fixed a bug that occurred with recent matplotlib versions when using the rectangle selector in `InteractiveGraph`.
 - 4.12.6 Added support for graphs with nodes but no edges to `EditableGraph` (issue #62).

netgraph/__init__.py

@@ -98,7 +98,7 @@
 >>> help(EditableGraph)
 """
 
-__version__ = "4.12.9"
+__version__ = "4.12.10"
 __author__ = "Paul Brodersen"
 __email__ = "[email protected]"
 

netgraph/_main.py

@@ -884,7 +884,8 @@ def _initialize_node_label_fontdict(self, node_label_fontdict, node_labels, node
             # Labels are centered on node artists.
             # Set fontsize such that labels fit the diameter of the node artists.
             size = self._get_font_size(node_labels, node_label_fontdict) * 0.75 # conservative fudge factor
-            node_label_fontdict.setdefault('size', size)
+            if ('size' not in node_label_fontdict) and ('fontsize' not in node_label_fontdict):
+                node_label_fontdict.setdefault('size', size)
 
         return node_label_fontdict
 
@@ -904,6 +905,8 @@ def _get_font_size(self, node_labels, node_label_fontdict):
 
         if 'size' in node_label_fontdict:
             size = rescale_factor * node_label_fontdict['size']
+        elif 'fontsize' in node_label_fontdict:
+            size = rescale_factor * node_label_fontdict['fontsize']
         else:
             size = rescale_factor * plt.rcParams['font.size']
         return size

setup.py

@@ -6,7 +6,7 @@ def read_file(filename):
     with open(os.path.join(os.path.dirname(__file__), filename)) as file:
         return file.read()
 
-version = '4.12.9'
+version = '4.12.10'
 
 setup(
     name='netgraph',