newsworthycharts 1.54.1__tar.gz → 1.54.4__tar.gz

{newsworthycharts-1.54.1 → newsworthycharts-1.54.4}/PKG-INFO

@@ -1,9 +1,9 @@
 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
@@ -168,6 +168,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 → newsworthycharts-1.54.4}/README.rst

@@ -155,6 +155,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 → newsworthycharts-1.54.4}/newsworthycharts/__init__.py

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

{newsworthycharts-1.54.1 → newsworthycharts-1.54.4}/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-1.54.1 → newsworthycharts-1.54.4}/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-1.54.1 → newsworthycharts-1.54.4}/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 → newsworthycharts-1.54.4}/newsworthycharts.egg-info/PKG-INFO

@@ -1,9 +1,9 @@
 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
@@ -168,6 +168,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 → newsworthycharts-1.54.4}/newsworthycharts.egg-info/requires.txt

@@ -1,13 +1,13 @@
-Babel>=2.12
+Babel<3,>=2.14.0
 Pillow==10.1.0
 PyYAML>=3
 adjustText==0.7.3
 boto3>=1.26
-geopandas==0.14.0
+geopandas==0.14.1
 langcodes>=3.3
 mapclassify==2.6.1
 matplotlib-label-lines==0.5.1
-matplotlib==3.8.1
-numpy<2,>=1.19.1
-python-dateutil>=2
+matplotlib==3.8.2
+numpy<2,>=1.21.0
+python-dateutil<3,>=2
 requests>=2.22

{newsworthycharts-1.54.1 → newsworthycharts-1.54.4}/requirements.txt

@@ -1,10 +1,10 @@
-boto3==1.28.72
-matplotlib==3.8.1
+boto3==1.34.2
+matplotlib==3.8.2
 langcodes==3.3.0
-Babel==2.13.1
+Babel==2.14.0
 PyYAML==6.0.1
 adjustText==0.7.3
-numpy==1.26.1
+numpy==1.26.2
 python-dateutil==2.8.2
 pytest==7.4.3
 flake8==6.1.0
@@ -12,5 +12,5 @@ requests==2.31.0
 python-dotenv==1.0.0
 matplotlib-label-lines==0.5.1
 Pillow==10.1.0
-geopandas==0.14.0
+geopandas==0.14.1
 mapclassify==2.6.1

{newsworthycharts-1.54.1 → newsworthycharts-1.54.4}/setup.py

@@ -25,17 +25,17 @@ setup(
     python_requires='>=3.9',
     install_requires=[
         "boto3>=1.26",
-        "matplotlib==3.8.1",
+        "matplotlib==3.8.2",
         "langcodes>=3.3",
-        "Babel>=2.12",
+        "Babel>=2.14.0,<3",
         "PyYAML>=3",
         "adjustText==0.7.3",
-        "numpy>=1.19.1,<2",
-        "python-dateutil>=2",
+        "numpy>=1.21.0,<2",
+        "python-dateutil>=2,<3",
         "Pillow==10.1.0",
         "requests>=2.22",
         "matplotlib-label-lines==0.5.1",
-        "geopandas==0.14.0",
+        "geopandas==0.14.1",
         "mapclassify==2.6.1",
     ],
     setup_requires=["flake8"],