newsworthycharts 1.68.0__tar.gz → 1.69.0__tar.gz

{newsworthycharts-1.68.0/newsworthycharts.egg-info → newsworthycharts-1.69.0}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.68.0
+Version: 1.69.0
 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.68.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.69.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.9.2
+Requires-Dist: matplotlib==3.9.3
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
@@ -208,6 +208,8 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
 
 _ Inherits from Map _
 
+  - `label_order` = None  # A list of categorical values, to control the order of the labels in the legend
+
 **BubbleMap**
 
 _ Inherits from Map _
@@ -259,6 +261,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.69.0
+
+  - New `label_order` argument in ChoroplethMap
+
+- 1.68.1
+
+  - Fixed crash in `ChoroplethMap` with non-numerical values
+  - Fix Matplotlib version in setup.py
+
 - 1.68.0
 
   - Matplotlib==3.9.3

{newsworthycharts-1.68.0 → newsworthycharts-1.69.0}/README.rst

@@ -181,6 +181,8 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
 
 _ Inherits from Map _
 
+  - `label_order` = None  # A list of categorical values, to control the order of the labels in the legend
+
 **BubbleMap**
 
 _ Inherits from Map _
@@ -232,6 +234,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.69.0
+
+  - New `label_order` argument in ChoroplethMap
+
+- 1.68.1
+
+  - Fixed crash in `ChoroplethMap` with non-numerical values
+  - Fix Matplotlib version in setup.py
+
 - 1.68.0
 
   - Matplotlib==3.9.3

{newsworthycharts-1.68.0 → newsworthycharts-1.69.0}/newsworthycharts/__init__.py

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

{newsworthycharts-1.68.0 → newsworthycharts-1.69.0}/newsworthycharts/chart.py

@@ -504,6 +504,9 @@ class Chart(object):
                 except AttributeError:
                     # values is undefined for catCharts
                     pass
+                except ValueError:
+                    # non-numerical data
+                    pass
                 if all_integers:
                     self.decimals = 0
                 else:

{newsworthycharts-1.68.0 → newsworthycharts-1.69.0}/newsworthycharts/choroplethmap.py

@@ -26,6 +26,7 @@ class ChoroplethMap(Map):
 
     def __init__(self, *args, **kwargs):
         super(ChoroplethMap, self).__init__(*args, **kwargs)
+        self.label_order = kwargs.get("label_order", None)
 
     def _add_data(self):
 
@@ -143,7 +144,9 @@ class ChoroplethMap(Map):
 
             # Geopandas does not handle legend if color keyword is used
             # We need to add it ourselves
-            for label, color in color_map.items():
+            label_order = self.label_order or color_map.keys()
+            for label in reversed(label_order):
+                color = color_map[label]
                 # A bit of an hack:
                 # Check if this corresponds to one of our predefined
                 # color names:

{newsworthycharts-1.68.0 → newsworthycharts-1.69.0}/newsworthycharts/lib/datalist.py

@@ -176,9 +176,12 @@ class DataSet(MutableSequence):
         self.extend(list(args))
 
     def check(self, v):
-        # Update metadata with newly added data
-        values = [to_float(x[1]) for x in v]
-        values = [x for x in values if x is not None]
+        # Update metadata with newly added data, if numerical
+        try:
+            values = [to_float(x[1]) for x in v]
+            values = [x for x in values if x is not None]
+        except ValueError:
+            values = None
         if values:
             self.min_val = min(self.min_val, min(values))
             self.max_val = max(self.max_val, max(values))

{newsworthycharts-1.68.0 → newsworthycharts-1.69.0/newsworthycharts.egg-info}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: newsworthycharts
-Version: 1.68.0
+Version: 1.69.0
 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.68.0.tar.gz
+Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.69.0.tar.gz
 Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
 Author-email: stockholm@jplusplus.org
 License: MIT
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: boto3>=1.26
-Requires-Dist: matplotlib==3.9.2
+Requires-Dist: matplotlib==3.9.3
 Requires-Dist: langcodes>=3.3
 Requires-Dist: Babel<3,>=2.14.0
 Requires-Dist: PyYAML>=3
@@ -208,6 +208,8 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
 
 _ Inherits from Map _
 
+  - `label_order` = None  # A list of categorical values, to control the order of the labels in the legend
+
 **BubbleMap**
 
 _ Inherits from Map _
@@ -259,6 +261,15 @@ Roadmap
 Changelog
 ---------
 
+- 1.69.0
+
+  - New `label_order` argument in ChoroplethMap
+
+- 1.68.1
+
+  - Fixed crash in `ChoroplethMap` with non-numerical values
+  - Fix Matplotlib version in setup.py
+
 - 1.68.0
 
   - Matplotlib==3.9.3

{newsworthycharts-1.68.0 → newsworthycharts-1.69.0}/newsworthycharts.egg-info/requires.txt

@@ -1,5 +1,5 @@
 boto3>=1.26
-matplotlib==3.9.2
+matplotlib==3.9.3
 langcodes>=3.3
 Babel<3,>=2.14.0
 PyYAML>=3

{newsworthycharts-1.68.0 → newsworthycharts-1.69.0}/setup.py

@@ -25,7 +25,7 @@ setup(
     python_requires='>=3.9',
     install_requires=[
         "boto3>=1.26",
-        "matplotlib==3.9.2",
+        "matplotlib==3.9.3",
         "langcodes>=3.3",
         "Babel>=2.14.0,<3",
         "PyYAML>=3",