newsworthycharts 1.63.1__py3-none-any.whl → 1.63.3__py3-none-any.whl

newsworthycharts/__init__.py

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

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/lib/utils.py

@@ -167,9 +167,10 @@ def guess_date_interval(data):
     for serie in data:
         dates = [to_date(x[0]) for x in serie]
         years = [x.year for x in dates]
+        decades = [x.year // 10 * 10 for x in dates]
 
         # Are there decades with more than one year?
-        if len(years) > len(set(years)):
+        if len(set(years)) > len(set(decades)):
             interval = "yearly"
 
         months = [x.month for x in dates]

{newsworthycharts-1.63.1.dist-info → newsworthycharts-1.63.3.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.63.1
+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.1.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,15 @@ 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
+
 - 1.63.1
 
   - Fix version number in

{newsworthycharts-1.63.1.dist-info → newsworthycharts-1.63.3.dist-info}/RECORD

@@ -1,7 +1,7 @@
-newsworthycharts/__init__.py,sha256=E48LF4oCZ6yGY-iy0QL52s74anipu1QTGh6ym2HH_00,1160
+newsworthycharts/__init__.py,sha256=9VNVfOA2MGy4aVQdkpN7EVvF2P5SKlJF0Q2_X1-4BeM,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=LwOZ3VbNy9vzvoK0s77AkbfMt4CXVDSAhnsnBInUIrE,14764
-newsworthycharts/chart.py,sha256=e118gGQbFpRJZl3SWLhVCBatclG80eFdojrxJn8td5g,31664
+newsworthycharts/chart.py,sha256=DzyqHQ_t-LQVya_FymAfDQWzPLYB4GTk9wFOM95N-7Y,32358
 newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
@@ -21,15 +21,15 @@ newsworthycharts/lib/formatter.py,sha256=GNH43hE0bC17OgiV8LYH3YUrEhm7OJh9XzfSV4H
 newsworthycharts/lib/geography.py,sha256=K0_teFmuPJwXX7Py-amJB_1YY5_gL2kBYhz1LrRCyTg,584
 newsworthycharts/lib/locator.py,sha256=rJHdgiA0LASRzdLINhTeU5zOoq1TCMgge4KOBWSagnM,3041
 newsworthycharts/lib/mimetypes.py,sha256=bL9HtVWbn2Of39LcBt4u4yelkr4bGZiyebq3OfLnfFY,237
-newsworthycharts/lib/utils.py,sha256=Io_yBHxUDTXw-9GvsizdSXnYvE_7ZtDKiWpLTAXpHfA,7171
+newsworthycharts/lib/utils.py,sha256=l4SUVB-8lnm3XHqHNo5KgZuZNv_VaFnrH76hrZmDq1s,7231
 newsworthycharts/maps/se-4.gpkg,sha256=oWw5j7FPVpI0ig67jNDim8qSn5SG8rcHp0014-uTKZM,290816
 newsworthycharts/maps/se-7.gpkg,sha256=Vmvqudq_ZtgV0sd6TY6kuk7vzqmYZCJmaxtsJ87q2a8,331776
 newsworthycharts/rc/newsworthy,sha256=vbYTav1w3DmB5tpaaV7Xl5q7TQJsc9eou6pLCoWc2vs,1589
 newsworthycharts/translations/datawrapper_regions.csv,sha256=fzZcQRX6RFMlNNP8mpgfYNdR3Y0QAlQxDXk8FXTaWWI,9214
 newsworthycharts/translations/regions.py,sha256=Nv1McQjggD4S3JRu82rDMTG3pqUVR13E5-FBpSYbm98,239
 newsworthycharts/translations/se_municipalities.csv,sha256=br_mm-IvzQtj_W55_ATREhJ97jWnCweBFlDAVY2EBxA,7098
-newsworthycharts-1.63.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.63.1.dist-info/METADATA,sha256=CEKJTndJI0BsR1SUdgyNJMqradS2NTCUQoKf7fRco8w,29326
-newsworthycharts-1.63.1.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-newsworthycharts-1.63.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.63.1.dist-info/RECORD,,
+newsworthycharts-1.63.3.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.63.3.dist-info/METADATA,sha256=lqj-Zs5zczMZRivCuochTp2DhjkLlOvzfQ7frn__8E4,29524
+newsworthycharts-1.63.3.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.63.3.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.63.3.dist-info/RECORD,,