newsworthycharts 1.54.1__py3-none-any.whl → 1.54.4__py3-none-any.whl

newsworthycharts/__init__.py

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

newsworthycharts/chart.py

@@ -376,7 +376,6 @@ class Chart(object):
             loc = get_best_locator(delta, len(dates), self.interval)
             self.ax.xaxis.set_major_locator(loc)
             formatter = Formatter(self._language)
-            print(self._language)
 
             # if isinstance(loc, WeekdayLocator):
             if self.interval == "weekly":
@@ -473,13 +472,20 @@ class Chart(object):
                         keep_trying = False
                     try_dec += 1
             # If we still have duplicates; remove them!
-            """
-            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):
-                tl = [x if i < len(tl) - 1 and tl[i + 1] != x else "" for (i, x) in enumerate(tl)]
-                self.value_axis.set_ticklabels(tl)
-            """
+            # If we still have duplicates; remove them!
+            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
+                    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)
 
         for a in self.annotations:
             self._annotate_point(a["text"], a["xy"], a["direction"])

newsworthycharts/lib/formatter.py

@@ -67,7 +67,7 @@ class Formatter(object):
             pattern[1] = ".#" + pattern[1]
             pattern = "0".join(pattern)
         string = format_decimal(x, locale=self.l, format=pattern)
-        minus = self.l.number_symbols["minusSign"]
+        minus = self.l.number_symbols["latn"]["minusSign"]
         string = string.replace("-", minus)
         return string
 
@@ -79,7 +79,7 @@ class Formatter(object):
 
         x = round(Decimal(x), decimals)
         string = format_unit(x, 'temperature-generic', "short", locale=self.l)
-        minus = self.l.number_symbols["minusSign"]
+        minus = self.l.number_symbols["latn"]["minusSign"]
         string = string.replace("-", minus)
         # if x > 0:
         #     string = "+" + string
@@ -94,7 +94,7 @@ class Formatter(object):
         scale = "temperature-{}".format(self.scale)
         x = round(Decimal(x), decimals)
         string = format_unit(x, scale, "short", locale=self.l)
-        minus = self.l.number_symbols["minusSign"]
+        minus = self.l.number_symbols["latn"]["minusSign"]
         string = string.replace("-", minus)
         return string
 
@@ -117,7 +117,7 @@ class Formatter(object):
             pattern[1] = "0" * decimals + pattern[1]
             pattern = ".".join(pattern)
         string = format_decimal(x, locale=self.l, format=pattern)
-        minus = self.l.number_symbols["minusSign"]
+        minus = self.l.number_symbols["latn"]["minusSign"]
         string = string.replace("-", minus)
         return string
 

newsworthycharts/serialchart.py

@@ -529,7 +529,8 @@ class SerialChart(Chart):
         # title is assumed to self-explanatory
         if len(self.labels) > 1:
             if self.label_placement == "legend":
-                self.ax.legend(loc="best")
+                _ = self.ax.legend(loc="best")
+                _.set(zorder=10)
             elif self.label_placement == "outside":
                 self.ax.legend(bbox_to_anchor=(0, 1, 1, 0), loc="lower right")
             elif self.label_placement == "inline":

{newsworthycharts-1.54.1.dist-info → newsworthycharts-1.54.4.dist-info}/METADATA

@@ -1,27 +1,27 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.54.1
+Version: 1.54.4
 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.54.1.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.54.4.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
 Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
-Requires-Dist: Babel >=2.12
+Requires-Dist: Babel <3,>=2.14.0
 Requires-Dist: Pillow ==10.1.0
 Requires-Dist: PyYAML >=3
 Requires-Dist: adjustText ==0.7.3
 Requires-Dist: boto3 >=1.26
-Requires-Dist: geopandas ==0.14.0
+Requires-Dist: geopandas ==0.14.1
 Requires-Dist: langcodes >=3.3
 Requires-Dist: mapclassify ==2.6.1
 Requires-Dist: matplotlib-label-lines ==0.5.1
-Requires-Dist: matplotlib ==3.8.1
-Requires-Dist: numpy <2,>=1.19.1
-Requires-Dist: python-dateutil >=2
+Requires-Dist: matplotlib ==3.8.2
+Requires-Dist: numpy <2,>=1.21.0
+Requires-Dist: python-dateutil <3,>=2
 Requires-Dist: requests >=2.22
 
 This  module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
@@ -181,6 +181,25 @@ Roadmap
 Changelog
 ---------
 
+- 1.54.4
+
+  - Use Babel 2.14, and pin version
+  - Require numpy>=1.21.0 (now required by Matplotlib)
+  - Patch upgrades: matplotlib==3.8.2; geopandas==0.14.1
+
+- 1.54.3
+
+  - Fix duplicated integer values in y axis
+
+- 1.54.2
+
+  - Make sure that legend is always on top of bars in stacked bar charts
+  - Support more stacked categories in serial bar charts
+
+- 1.52.2+
+
+  - Backport various 1.54.x fixes
+
 - 1.54.1
 
   - Patch upgrade Matplotlib to 3.8.1

{newsworthycharts-1.54.1.dist-info → newsworthycharts-1.54.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
-newsworthycharts/__init__.py,sha256=Zjv_yvTRWqwCfiUEt-nfCUeitUuKmx6NQdff_vXxIiM,1160
+newsworthycharts/__init__.py,sha256=lUar7rzqonwWFT9D99y-rjteKifHZ4_3CizWrEFoSk8,1160
 newsworthycharts/bubblemap.py,sha256=_AMj3RkmKDKVmrtj3FuuY776xRUSEf2qE8tG0vQ3Lyg,2619
 newsworthycharts/categoricalchart.py,sha256=k2cd96pNysbVU88nZduiLGpzyjMsDXTbASAVu6ov-kI,14686
-newsworthycharts/chart.py,sha256=5mbqaaInC7XEknXDj1eGEJbGa4AwXCLNIvMTYSnBqeY,30253
+newsworthycharts/chart.py,sha256=FX8aMTAZCUYtDpY4UNvKAly7NevZSFAVraK4JNdxp5Q,30557
 newsworthycharts/choroplethmap.py,sha256=KXtdiRBe-_j_zUozUgdhAWyoYN-eUdFxt9mneN10H1w,6670
 newsworthycharts/datalist.py,sha256=pQTzWg1lKslAstiF04oK7FwvoxTK2-1jOvrlOy7bGpk,3721
 newsworthycharts/datawrapper.py,sha256=RRkAVTpfP4updKxUIBaSmKuBi2RUVPaBRF8HDQhlGGA,11250
@@ -12,7 +12,7 @@ newsworthycharts/mimetypes.py,sha256=t_wD5FD2o1Di7NWAQGwc8ScPry48S1_7hX03_1Do-G8
 newsworthycharts/rangeplot.py,sha256=NE1W9TnmlpK6T3RvBJOU3nd73EXqkj17OY9i5zlw_cQ,8366
 newsworthycharts/scatterplot.py,sha256=6iaMoiZx__Gc-2Hcdw-8Ga5dSonrFo3oexKNmSFuir4,4959
 newsworthycharts/seasonalchart.py,sha256=rr55yqJUkaYDR9Ik98jes6574oY1U8t8LwoLE3gClW4,1967
-newsworthycharts/serialchart.py,sha256=AZwzSKdpJHF8G2OxSurTGnd5Hq95z8k-puLUzSQMUHQ,24526
+newsworthycharts/serialchart.py,sha256=mEE-9Yahas7o86wTaynJY4hyhBm1If5qPYB8gExMXlo,24563
 newsworthycharts/storage.py,sha256=myERhlpvXyExXxUByBq9eW1bWkCyfH9SwTZbsWSyy3Q,4301
 newsworthycharts/stripechart.py,sha256=9B6PX2MyLuKNQ8W0OGdKbP0-U32kju0K_NHHwwz_J68,1547
 newsworthycharts/utils.py,sha256=aC3OF-HAsEe_WnNV2Ah_oq0QYcAETUscRZ6nQBpazQg,2842
@@ -22,7 +22,7 @@ newsworthycharts/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 newsworthycharts/lib/color_fn.py,sha256=ck65GzTS9oPgHUCnKDwX2z8zlnNyzncw97MmhXwi8z8,1282
 newsworthycharts/lib/colors.py,sha256=U04TDkvoMQkcldRFXfnwyLOTwq1SWW2se-Ad-DNcw9o,485
 newsworthycharts/lib/datalist.py,sha256=fsO_esZBt4Aw_4n_l2LuswAYArbM-8Z8G9DAXo1oVZU,5376
-newsworthycharts/lib/formatter.py,sha256=jSMAohvf6rppjwXlnySCEHnBo6my2_vBN83C1xDIn00,4806
+newsworthycharts/lib/formatter.py,sha256=GNH43hE0bC17OgiV8LYH3YUrEhm7OJh9XzfSV4HVtHo,4838
 newsworthycharts/lib/geography.py,sha256=K0_teFmuPJwXX7Py-amJB_1YY5_gL2kBYhz1LrRCyTg,584
 newsworthycharts/lib/locator.py,sha256=Jdi6P6Z-3DSoG_lhYQKh97_asWt9JqBV3vBzHnf1k0I,2825
 newsworthycharts/lib/mimetypes.py,sha256=bL9HtVWbn2Of39LcBt4u4yelkr4bGZiyebq3OfLnfFY,237
@@ -33,8 +33,8 @@ newsworthycharts/rc/newsworthy,sha256=X0btLNrmk2DRrfOsKj_WCSIgeD6btacEN2tRF_B4m8
 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.54.1.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
-newsworthycharts-1.54.1.dist-info/METADATA,sha256=GjYefiB5IKSbJ_AXIbcuKSFSabfi2RQ5NIxH7uihR58,23239
-newsworthycharts-1.54.1.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-newsworthycharts-1.54.1.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
-newsworthycharts-1.54.1.dist-info/RECORD,,
+newsworthycharts-1.54.4.dist-info/LICENSE.txt,sha256=Sq6kGICrehbhC_FolNdXf0djKjTpv3YqjFCIYsxdQN4,1069
+newsworthycharts-1.54.4.dist-info/METADATA,sha256=iqOoG5714-3F9uiMWbM8pePOJHo089roKIdHkRCD8f0,23648
+newsworthycharts-1.54.4.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
+newsworthycharts-1.54.4.dist-info/top_level.txt,sha256=dn_kzIj8UgUCMsh1PHdVEQJHVGSsN7Z8YJF-8xXa8n0,17
+newsworthycharts-1.54.4.dist-info/RECORD,,