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

newsworthycharts/__init__.py

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

newsworthycharts/chart.py

@@ -396,7 +396,7 @@ class Chart(object):
                 d = num2date(x).isoformat()[:10]
                 # 9 years later
                 d2 = str(int(d[:4]) + 9) + d[4:]
-                if len(self.data.x_points) > 7:
+                if len(self.data.x_points) > 5:
                     return formatter.date(d, "yy") + "–" + formatter.date(d2, "yy")
                 else:
                     return formatter.date(d, "y") + "–" + formatter.date(d2, "yy")
@@ -493,7 +493,13 @@ class Chart(object):
                 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)]):
+                all_integers = False
+                try:
+                    all_integers = all([x.is_integer() for x in flatten(self.data.values)])
+                except AttributeError:
+                    # values is undefined for catCharts
+                    pass
+                if all_integers:
                     self.decimals = 0
                 else:
                     # Increase number of decimals until we have no duplicated y axis ticks,
@@ -519,18 +525,13 @@ class Chart(object):
             # 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):
+            if len(ticks_) == 2 and self.data and self.data.max_val:
+                # When only two ticks we want them on top and bottom
+                self.value_axis.set_ticks([float(ticks[0]._y), self.data.max_val])
+            elif len(ticks_) < len(ticks):
                 y = [float(x._y) for x in ticks_]
-                if self.decimals == 0:
-                    # Recrate with integres
-                    import math
-                    _bottom = min(y)
-                    _top = math.ceil(max(y))
-                    _bottom, _top = int(_bottom), int(_top)
-                    y = range(_bottom, _top + 1)
-                    y = [float(x) for x in y]
                 self.value_axis.set_ticks(y)
-            if self.decimals == 0:
+            elif 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()]

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.63.3
+Version: 1.63.5
 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.3.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.63.5.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -173,6 +173,8 @@ These settings are available for all chart types:
 
 **SeasonalChart**
 
+_ Inherits from SerialChart _
+
 **BubbleMap**
 
 - bubble_size = 1  # The size of the bubbles
@@ -183,7 +185,7 @@ These settings are available for all chart types:
 - annotation_rotation = 0
 - stacked = False
 - legend = True
-- colors = None
+- colors = None  # A dictionary of colors
 
 **CategoricalChartWithReference**
 
@@ -252,6 +254,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.63.5
+
+  - Improved edge case handling when using fixed decimal places and remove duplicated ticks
+  - Tighter x-axis ticks in decennial data
+
+- 1.63.4
+
+  - Fixed edge case in integer check
+
 - 1.63.3
 
   - Fixed bug in decimal auto detection

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

@@ -1,7 +1,7 @@
-newsworthycharts/__init__.py,sha256=9VNVfOA2MGy4aVQdkpN7EVvF2P5SKlJF0Q2_X1-4BeM,1160
+newsworthycharts/__init__.py,sha256=elEV2GIioxyMzFQUkHwXEsdCH1gR3LwXYvLY4CU7yjs,1160
 newsworthycharts/bubblemap.py,sha256=nkocWmpiFgfjEuJGAsthjY5X7Q56jXWsZHUGXw4PwgE,2587
 newsworthycharts/categoricalchart.py,sha256=LwOZ3VbNy9vzvoK0s77AkbfMt4CXVDSAhnsnBInUIrE,14764
-newsworthycharts/chart.py,sha256=DzyqHQ_t-LQVya_FymAfDQWzPLYB4GTk9wFOM95N-7Y,32358
+newsworthycharts/chart.py,sha256=-GHmdO0Q0YURamo9z4HG1mveTNsxaRSpQZFtGXhUe28,32431
 newsworthycharts/choroplethmap.py,sha256=bCLf4kcchp1C2djg5AxcOM8BdbaMj0xg7UHrZsDafhI,8013
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
 newsworthycharts/map.py,sha256=c409jEO4L8Yr780sJRC0RchR44roAlgOUDAkuk1SfRg,6057
@@ -28,8 +28,8 @@ newsworthycharts/rc/newsworthy,sha256=vbYTav1w3DmB5tpaaV7Xl5q7TQJsc9eou6pLCoWc2v
 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.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,,
+newsworthycharts-1.63.5.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.63.5.dist-info/METADATA,sha256=nKWWpnOJdxul89NpEJAsxcsB44S0PEUCxi1FY83jePo,29775
+newsworthycharts-1.63.5.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+newsworthycharts-1.63.5.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.63.5.dist-info/RECORD,,