newsworthycharts 1.63.2__tar.gz → 1.63.3__tar.gz

{newsworthycharts-1.63.2/newsworthycharts.egg-info → newsworthycharts-1.63.3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.63.2
+Version: 1.63.3
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.63.2.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.63.3.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -252,6 +252,11 @@ Roadmap
 Changelog
 ---------
 
+- 1.63.3
+
+  - Fixed bug in decimal auto detection
+  - Remove non integer value ticks when decimals are set to 0
+
 - 1.63.2
 
   - Fixed bug in interval detection in SerialChart, affecting yearly data

{newsworthycharts-1.63.2 → newsworthycharts-1.63.3}/README.rst

@@ -225,6 +225,11 @@ Roadmap
 Changelog
 ---------
 
+- 1.63.3
+
+  - Fixed bug in decimal auto detection
+  - Remove non integer value ticks when decimals are set to 0
+
 - 1.63.2
 
   - Fixed bug in interval detection in SerialChart, affecting yearly data

{newsworthycharts-1.63.2 → newsworthycharts-1.63.3}/newsworthycharts/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.63.2"
+__version__ = "1.63.3"
 
 from .chart import Chart
 from .choroplethmap import ChoroplethMap

{newsworthycharts-1.63.2 → newsworthycharts-1.63.3}/newsworthycharts/chart.py

@@ -486,35 +486,43 @@ class Chart(object):
         if not self.show_ticks:
             self.category_axis.set_visible(False)
         else:
-            # Increase number of decimals until we have no duplicated y axis ticks,
-            # unless .decimals explicitly set.
-            self._fig.canvas.draw()
-            tl = [x.get_text() for x in self.value_axis.get_ticklabels()]
-            tl_ = [x for (i, x) in enumerate(tl) if tl[i - 1] != x]
             autodetect_decimals = self.decimals is None
-            if len(tl_) < len(tl) and autodetect_decimals:
-                try_dec = 1
-                keep_trying = True
-                while keep_trying:
-                    self.decimals = try_dec
-                    if len(self.data):
-                        self._add_data()
+            if autodetect_decimals:
+                # Are all numbers integers?
+
+                def flatten(list_of_lists):
+                    return [item for sublist in list_of_lists for item in sublist]
+
+                if "values" in self.data and all([x.is_integer() for x in flatten(self.data.values)]):
+                    self.decimals = 0
+                else:
+                    # Increase number of decimals until we have no duplicated y axis ticks,
+                    # unless .decimals explicitly set.
                     self._fig.canvas.draw()
                     tl = [x.get_text() for x in self.value_axis.get_ticklabels()]
                     tl_ = [x for (i, x) in enumerate(tl) if tl[i - 1] != x]
-                    if len(tl) == len(tl_):
-                        keep_trying = False
-                    if try_dec > 2:
-                        keep_trying = False
-                    try_dec += 1
-            # If we still have duplicates; remove them!
-            # If we still have duplicates; remove them!
+                    if len(tl_) < len(tl):
+                        try_dec = 1
+                        keep_trying = True
+                        while keep_trying:
+                            self.decimals = try_dec
+                            if len(self.data):
+                                self._add_data()
+                            self._fig.canvas.draw()
+                            tl = [x.get_text() for x in self.value_axis.get_ticklabels()]
+                            tl_ = [x for (i, x) in enumerate(tl) if tl[i - 1] != x]
+                            if len(tl) == len(tl_):
+                                keep_trying = False
+                            if try_dec > 2:
+                                keep_trying = False
+                            try_dec += 1
+            # Remove duplicate y ticks (most should be gone as per above)
             ticks = self.value_axis.get_ticklabels()
             ticks_ = [x for (i, x) in enumerate(ticks) if ticks[i - 1].get_text() != x.get_text()]
             if len(ticks_) < len(ticks):
                 y = [float(x._y) for x in ticks_]
                 if self.decimals == 0:
-                    # Recrate with integeres
+                    # Recrate with integres
                     import math
                     _bottom = min(y)
                     _top = math.ceil(max(y))
@@ -522,6 +530,11 @@ class Chart(object):
                     y = range(_bottom, _top + 1)
                     y = [float(x) for x in y]
                 self.value_axis.set_ticks(y)
+            if self.decimals == 0:
+                # remove non integer ticks
+                y = [float(x._y) for x in ticks]
+                y = [x for x in y if x.is_integer()]
+                self.value_axis.set_ticks(y)
 
         for a in self.annotations:
             self._annotate_point(a["text"], a["xy"], a["direction"])

{newsworthycharts-1.63.2 → newsworthycharts-1.63.3/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.63.2
+Version: 1.63.3
 Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
 Home-page: https://github.com/jplusplus/newsworthycharts
-Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.63.2.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.63.3.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -252,6 +252,11 @@ Roadmap
 Changelog
 ---------
 
+- 1.63.3
+
+  - Fixed bug in decimal auto detection
+  - Remove non integer value ticks when decimals are set to 0
+
 - 1.63.2
 
   - Fixed bug in interval detection in SerialChart, affecting yearly data