newsworthycharts 1.73.2__tar.gz → 1.74.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (52) hide show
  1. {newsworthycharts-1.73.2/newsworthycharts.egg-info → newsworthycharts-1.74.0}/PKG-INFO +33 -11
  2. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/README.rst +18 -7
  3. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/__init__.py +1 -1
  4. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/chart.py +2 -1
  5. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/choroplethmap.py +8 -2
  6. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/seasonalchart.py +1 -1
  7. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/serialchart.py +5 -0
  8. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0/newsworthycharts.egg-info}/PKG-INFO +33 -11
  9. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts.egg-info/requires.txt +1 -1
  10. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/setup.py +1 -1
  11. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/LICENSE.txt +0 -0
  12. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/MANIFEST.in +0 -0
  13. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/bubblemap.py +0 -0
  14. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/categoricalchart.py +0 -0
  15. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/custom/__init__.py +0 -0
  16. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/custom/climate_cars.py +0 -0
  17. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/datawrapper.py +0 -0
  18. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/__init__.py +0 -0
  19. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/color_fn.py +0 -0
  20. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/colors.py +0 -0
  21. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/datalist.py +0 -0
  22. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/formatter.py +0 -0
  23. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/geography.py +0 -0
  24. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/locator.py +0 -0
  25. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/mimetypes.py +0 -0
  26. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/lib/utils.py +0 -0
  27. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/map.py +0 -0
  28. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/maps/se-4.gpkg +0 -0
  29. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/maps/se-7.gpkg +0 -0
  30. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/rangeplot.py +0 -0
  31. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/rankchart.py +0 -0
  32. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/rc/newsworthy +0 -0
  33. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/scatterplot.py +0 -0
  34. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/storage.py +0 -0
  35. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/stripechart.py +0 -0
  36. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/translations/datawrapper_regions.csv +0 -0
  37. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/translations/regions.py +0 -0
  38. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts/translations/se_municipalities.csv +0 -0
  39. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts.egg-info/SOURCES.txt +0 -0
  40. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts.egg-info/dependency_links.txt +0 -0
  41. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts.egg-info/not-zip-safe +0 -0
  42. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/newsworthycharts.egg-info/top_level.txt +0 -0
  43. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/setup.cfg +0 -0
  44. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_categorical_chart.py +0 -0
  45. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_choropleth_maps.py +0 -0
  46. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_custom_climate_cars.py +0 -0
  47. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_data_list.py +0 -0
  48. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_datawrapper.py +0 -0
  49. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_main.py +0 -0
  50. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_rangeplot.py +0 -0
  51. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_scatterplot.py +0 -0
  52. {newsworthycharts-1.73.2 → newsworthycharts-1.74.0}/test/test_serial_chart.py +0 -0
@@ -1,9 +1,9 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.4
2
2
  Name: newsworthycharts
3
- Version: 1.73.2
3
+ Version: 1.74.0
4
4
  Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
5
5
  Home-page: https://github.com/jplusplus/newsworthycharts
6
- Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.73.2.tar.gz
6
+ Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.74.0.tar.gz
7
7
  Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
8
8
  Author-email: stockholm@jplusplus.org
9
9
  License: MIT
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
11
11
  Description-Content-Type: text/x-rst
12
12
  License-File: LICENSE.txt
13
13
  Requires-Dist: boto3>=1.26
14
- Requires-Dist: matplotlib==3.10.1
14
+ Requires-Dist: matplotlib==3.10.3
15
15
  Requires-Dist: langcodes>=3.3
16
16
  Requires-Dist: Babel<3,>=2.14.0
17
17
  Requires-Dist: PyYAML>=3
@@ -23,6 +23,17 @@ Requires-Dist: requests>=2.22
23
23
  Requires-Dist: matplotlib-label-lines==0.5.1
24
24
  Requires-Dist: geopandas==1.0.1
25
25
  Requires-Dist: mapclassify==2.8.1
26
+ Dynamic: author
27
+ Dynamic: author-email
28
+ Dynamic: description
29
+ Dynamic: description-content-type
30
+ Dynamic: download-url
31
+ Dynamic: home-page
32
+ Dynamic: license
33
+ Dynamic: license-file
34
+ Dynamic: requires-dist
35
+ Dynamic: requires-python
36
+ Dynamic: summary
26
37
 
27
38
  This module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
28
39
 
@@ -175,11 +186,11 @@ These settings are available for all chart types:
175
186
 
176
187
  **SeasonalChart**
177
188
 
178
- _ Inherits from SerialChart _
189
+ *Inherits from SerialChart*
179
190
 
180
191
  **BumpChart**
181
192
 
182
- _ Inherits from SerialChart _
193
+ *Inherits from SerialChart*
183
194
 
184
195
  - label_placement = "right" # [left|right|both|outside|legend]
185
196
  - highlight = None # The label value to of a line to highlight
@@ -202,6 +213,8 @@ _ Inherits from SerialChart _
202
213
 
203
214
  **CategoricalChartWithReference**
204
215
 
216
+ *Inherits from CategoricalChart*
217
+
205
218
  **Map**
206
219
 
207
220
  - `use_bins` = True # If False, the map will be colored by a continuous value
@@ -218,18 +231,17 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
218
231
 
219
232
  **ChoroplethMap**
220
233
 
221
- _ Inherits from Map _
234
+ *Inherits from Map*
222
235
 
223
- - `label_order` = None # A list of categorical values, to control the order of the labels in the legend
236
+ - `label_order` = None # A list of categorical values, to control the order of the labels in the legend
224
237
 
225
238
  **BubbleMap**
226
239
 
227
- _ Inherits from Map _
240
+ *Inherits from Map*
228
241
 
229
242
  **ProgressChart**
230
243
 
231
- _ Inherits from CategoricalChart _
232
-
244
+ *Inherits from CategoricalChart*
233
245
  - `target` = None # A target value to compare to, often 1 (when using percentages)
234
246
 
235
247
  **RangePlot**
@@ -273,6 +285,16 @@ Roadmap
273
285
  Changelog
274
286
  ---------
275
287
 
288
+ - 1.74.0
289
+
290
+ - Support quarterly data in SeasonalChart
291
+ - Dont adjust subplots headers if there is no title or subtitle
292
+
293
+ - 1.73.3
294
+
295
+ - Remove space around endash in legend title for unitless choropleth maps
296
+ - matplotlib==3.10.3
297
+
276
298
  - 1.73.2
277
299
 
278
300
  - Fix month locator bug for very short series
@@ -149,11 +149,11 @@ These settings are available for all chart types:
149
149
 
150
150
  **SeasonalChart**
151
151
 
152
- _ Inherits from SerialChart _
152
+ *Inherits from SerialChart*
153
153
 
154
154
  **BumpChart**
155
155
 
156
- _ Inherits from SerialChart _
156
+ *Inherits from SerialChart*
157
157
 
158
158
  - label_placement = "right" # [left|right|both|outside|legend]
159
159
  - highlight = None # The label value to of a line to highlight
@@ -176,6 +176,8 @@ _ Inherits from SerialChart _
176
176
 
177
177
  **CategoricalChartWithReference**
178
178
 
179
+ *Inherits from CategoricalChart*
180
+
179
181
  **Map**
180
182
 
181
183
  - `use_bins` = True # If False, the map will be colored by a continuous value
@@ -192,18 +194,17 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
192
194
 
193
195
  **ChoroplethMap**
194
196
 
195
- _ Inherits from Map _
197
+ *Inherits from Map*
196
198
 
197
- - `label_order` = None # A list of categorical values, to control the order of the labels in the legend
199
+ - `label_order` = None # A list of categorical values, to control the order of the labels in the legend
198
200
 
199
201
  **BubbleMap**
200
202
 
201
- _ Inherits from Map _
203
+ *Inherits from Map*
202
204
 
203
205
  **ProgressChart**
204
206
 
205
- _ Inherits from CategoricalChart _
206
-
207
+ *Inherits from CategoricalChart*
207
208
  - `target` = None # A target value to compare to, often 1 (when using percentages)
208
209
 
209
210
  **RangePlot**
@@ -247,6 +248,16 @@ Roadmap
247
248
  Changelog
248
249
  ---------
249
250
 
251
+ - 1.74.0
252
+
253
+ - Support quarterly data in SeasonalChart
254
+ - Dont adjust subplots headers if there is no title or subtitle
255
+
256
+ - 1.73.3
257
+
258
+ - Remove space around endash in legend title for unitless choropleth maps
259
+ - matplotlib==3.10.3
260
+
250
261
  - 1.73.2
251
262
 
252
263
  - Fix month locator bug for very short series
@@ -1,4 +1,4 @@
1
- __version__ = "1.73.2"
1
+ __version__ = "1.74.0"
2
2
 
3
3
  from .chart import Chart
4
4
  from .choroplethmap import ChoroplethMap
@@ -659,7 +659,8 @@ class Chart(object):
659
659
  header_height += self._title_rel_height
660
660
  if self._subtitle_elem:
661
661
  header_height += self._subtitle_rel_height
662
- self._fig.subplots_adjust(top=1 - header_height)
662
+ if self._title_elem or self._subtitle_elem:
663
+ self._fig.subplots_adjust(top=1 - header_height)
663
664
 
664
665
  # Fit area below chart
665
666
  try:
@@ -140,9 +140,15 @@ class ChoroplethMap(Map):
140
140
  if binning.counts[idx] == 1:
141
141
  txt_val = fmt(cat)
142
142
  elif idx == 0:
143
- txt_val = f"– {fmt(cat)}"
143
+ if self.units == "number":
144
+ txt_val = f"–{fmt(cat)}"
145
+ else:
146
+ txt_val = f"– {fmt(cat)}"
144
147
  else:
145
- txt_val = f"{fmt(binning.bins[idx - 1])} – {fmt(cat)}"
148
+ if self.units == "number":
149
+ txt_val = f"{fmt(binning.bins[idx - 1])}–{fmt(cat)}"
150
+ else:
151
+ txt_val = f"{fmt(binning.bins[idx - 1])} – {fmt(cat)}"
146
152
  patches.append(mpatches.Patch(color=mapper.to_rgba(cat), label=txt_val))
147
153
 
148
154
  elif self.categorical:
@@ -23,7 +23,7 @@ class SeasonalChart(SerialChart):
23
23
  interval = self.interval or self._guess_interval()
24
24
  # Use either highlight or last point of the series that extends furthest to the right
25
25
  seasonal_point = self.highlight or self.data.outer_max_x
26
- if interval == "monthly":
26
+ if interval in ["monthly", "quarterly"]:
27
27
  date_suffix = seasonal_point[-5:]
28
28
  else:
29
29
  raise NotImplementedError("Seasonal chart currently only supports monthly data")
@@ -633,6 +633,11 @@ class SerialChart(Chart):
633
633
  if ymin > self.baseline and self.allow_broken_y_axis:
634
634
  self._mark_broken_axis()
635
635
 
636
+ """
637
+ if all([x == "markers" for x in self.type]):
638
+ # ....
639
+ else:
640
+ """
636
641
  self._set_date_ticks(dates)
637
642
 
638
643
  # Add labels in legend if there are multiple series, otherwise
@@ -1,9 +1,9 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.4
2
2
  Name: newsworthycharts
3
- Version: 1.73.2
3
+ Version: 1.74.0
4
4
  Summary: Matplotlib wrapper to create charts and publish them on Amazon S3
5
5
  Home-page: https://github.com/jplusplus/newsworthycharts
6
- Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.73.2.tar.gz
6
+ Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.74.0.tar.gz
7
7
  Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
8
8
  Author-email: stockholm@jplusplus.org
9
9
  License: MIT
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
11
11
  Description-Content-Type: text/x-rst
12
12
  License-File: LICENSE.txt
13
13
  Requires-Dist: boto3>=1.26
14
- Requires-Dist: matplotlib==3.10.1
14
+ Requires-Dist: matplotlib==3.10.3
15
15
  Requires-Dist: langcodes>=3.3
16
16
  Requires-Dist: Babel<3,>=2.14.0
17
17
  Requires-Dist: PyYAML>=3
@@ -23,6 +23,17 @@ Requires-Dist: requests>=2.22
23
23
  Requires-Dist: matplotlib-label-lines==0.5.1
24
24
  Requires-Dist: geopandas==1.0.1
25
25
  Requires-Dist: mapclassify==2.8.1
26
+ Dynamic: author
27
+ Dynamic: author-email
28
+ Dynamic: description
29
+ Dynamic: description-content-type
30
+ Dynamic: download-url
31
+ Dynamic: home-page
32
+ Dynamic: license
33
+ Dynamic: license-file
34
+ Dynamic: requires-dist
35
+ Dynamic: requires-python
36
+ Dynamic: summary
26
37
 
27
38
  This module contains methods for producing graphs and publishing them on Amazon S3, or in the location of your choice.
28
39
 
@@ -175,11 +186,11 @@ These settings are available for all chart types:
175
186
 
176
187
  **SeasonalChart**
177
188
 
178
- _ Inherits from SerialChart _
189
+ *Inherits from SerialChart*
179
190
 
180
191
  **BumpChart**
181
192
 
182
- _ Inherits from SerialChart _
193
+ *Inherits from SerialChart*
183
194
 
184
195
  - label_placement = "right" # [left|right|both|outside|legend]
185
196
  - highlight = None # The label value to of a line to highlight
@@ -202,6 +213,8 @@ _ Inherits from SerialChart _
202
213
 
203
214
  **CategoricalChartWithReference**
204
215
 
216
+ *Inherits from CategoricalChart*
217
+
205
218
  **Map**
206
219
 
207
220
  - `use_bins` = True # If False, the map will be colored by a continuous value
@@ -218,18 +231,17 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
218
231
 
219
232
  **ChoroplethMap**
220
233
 
221
- _ Inherits from Map _
234
+ *Inherits from Map*
222
235
 
223
- - `label_order` = None # A list of categorical values, to control the order of the labels in the legend
236
+ - `label_order` = None # A list of categorical values, to control the order of the labels in the legend
224
237
 
225
238
  **BubbleMap**
226
239
 
227
- _ Inherits from Map _
240
+ *Inherits from Map*
228
241
 
229
242
  **ProgressChart**
230
243
 
231
- _ Inherits from CategoricalChart _
232
-
244
+ *Inherits from CategoricalChart*
233
245
  - `target` = None # A target value to compare to, often 1 (when using percentages)
234
246
 
235
247
  **RangePlot**
@@ -273,6 +285,16 @@ Roadmap
273
285
  Changelog
274
286
  ---------
275
287
 
288
+ - 1.74.0
289
+
290
+ - Support quarterly data in SeasonalChart
291
+ - Dont adjust subplots headers if there is no title or subtitle
292
+
293
+ - 1.73.3
294
+
295
+ - Remove space around endash in legend title for unitless choropleth maps
296
+ - matplotlib==3.10.3
297
+
276
298
  - 1.73.2
277
299
 
278
300
  - Fix month locator bug for very short series
@@ -1,5 +1,5 @@
1
1
  boto3>=1.26
2
- matplotlib==3.10.1
2
+ matplotlib==3.10.3
3
3
  langcodes>=3.3
4
4
  Babel<3,>=2.14.0
5
5
  PyYAML>=3
@@ -25,7 +25,7 @@ setup(
25
25
  python_requires='>=3.9',
26
26
  install_requires=[
27
27
  "boto3>=1.26",
28
- "matplotlib==3.10.1",
28
+ "matplotlib==3.10.3",
29
29
  "langcodes>=3.3",
30
30
  "Babel>=2.14.0,<3",
31
31
  "PyYAML>=3",