newsworthycharts 1.73.3__tar.gz → 1.74.1__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.3/newsworthycharts.egg-info → newsworthycharts-1.74.1}/PKG-INFO +20 -9
  2. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/README.rst +18 -7
  3. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/__init__.py +1 -1
  4. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/chart.py +11 -10
  5. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/choroplethmap.py +1 -0
  6. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/seasonalchart.py +1 -1
  7. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1/newsworthycharts.egg-info}/PKG-INFO +20 -9
  8. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/LICENSE.txt +0 -0
  9. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/MANIFEST.in +0 -0
  10. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/bubblemap.py +0 -0
  11. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/categoricalchart.py +0 -0
  12. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/custom/__init__.py +0 -0
  13. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/custom/climate_cars.py +0 -0
  14. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/datawrapper.py +0 -0
  15. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/__init__.py +0 -0
  16. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/color_fn.py +0 -0
  17. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/colors.py +0 -0
  18. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/datalist.py +0 -0
  19. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/formatter.py +0 -0
  20. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/geography.py +0 -0
  21. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/locator.py +0 -0
  22. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/mimetypes.py +0 -0
  23. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/lib/utils.py +0 -0
  24. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/map.py +0 -0
  25. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/maps/se-4.gpkg +0 -0
  26. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/maps/se-7.gpkg +0 -0
  27. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/rangeplot.py +0 -0
  28. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/rankchart.py +0 -0
  29. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/rc/newsworthy +0 -0
  30. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/scatterplot.py +0 -0
  31. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/serialchart.py +0 -0
  32. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/storage.py +0 -0
  33. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/stripechart.py +0 -0
  34. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/translations/datawrapper_regions.csv +0 -0
  35. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/translations/regions.py +0 -0
  36. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts/translations/se_municipalities.csv +0 -0
  37. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts.egg-info/SOURCES.txt +0 -0
  38. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts.egg-info/dependency_links.txt +0 -0
  39. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts.egg-info/not-zip-safe +0 -0
  40. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts.egg-info/requires.txt +0 -0
  41. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/newsworthycharts.egg-info/top_level.txt +0 -0
  42. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/setup.cfg +0 -0
  43. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/setup.py +0 -0
  44. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_categorical_chart.py +0 -0
  45. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_choropleth_maps.py +0 -0
  46. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_custom_climate_cars.py +0 -0
  47. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_data_list.py +0 -0
  48. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_datawrapper.py +0 -0
  49. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_main.py +0 -0
  50. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_rangeplot.py +0 -0
  51. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_scatterplot.py +0 -0
  52. {newsworthycharts-1.73.3 → newsworthycharts-1.74.1}/test/test_serial_chart.py +0 -0
@@ -1,9 +1,9 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: newsworthycharts
3
- Version: 1.73.3
3
+ Version: 1.74.1
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.3.tar.gz
6
+ Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.74.1.tar.gz
7
7
  Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
8
8
  Author-email: stockholm@jplusplus.org
9
9
  License: MIT
@@ -186,11 +186,11 @@ These settings are available for all chart types:
186
186
 
187
187
  **SeasonalChart**
188
188
 
189
- _ Inherits from SerialChart _
189
+ *Inherits from SerialChart*
190
190
 
191
191
  **BumpChart**
192
192
 
193
- _ Inherits from SerialChart _
193
+ *Inherits from SerialChart*
194
194
 
195
195
  - label_placement = "right" # [left|right|both|outside|legend]
196
196
  - highlight = None # The label value to of a line to highlight
@@ -213,6 +213,8 @@ _ Inherits from SerialChart _
213
213
 
214
214
  **CategoricalChartWithReference**
215
215
 
216
+ *Inherits from CategoricalChart*
217
+
216
218
  **Map**
217
219
 
218
220
  - `use_bins` = True # If False, the map will be colored by a continuous value
@@ -229,18 +231,17 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
229
231
 
230
232
  **ChoroplethMap**
231
233
 
232
- _ Inherits from Map _
234
+ *Inherits from Map*
233
235
 
234
- - `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
235
237
 
236
238
  **BubbleMap**
237
239
 
238
- _ Inherits from Map _
240
+ *Inherits from Map*
239
241
 
240
242
  **ProgressChart**
241
243
 
242
- _ Inherits from CategoricalChart _
243
-
244
+ *Inherits from CategoricalChart*
244
245
  - `target` = None # A target value to compare to, often 1 (when using percentages)
245
246
 
246
247
  **RangePlot**
@@ -284,6 +285,16 @@ Roadmap
284
285
  Changelog
285
286
  ---------
286
287
 
288
+ - 1.74.1
289
+
290
+ - Wait for data to be added before calculating dynamic heights and responsive typography
291
+ - Expose dataset from Map class
292
+
293
+ - 1.74.0
294
+
295
+ - Support quarterly data in SeasonalChart
296
+ - Dont adjust subplots headers if there is no title or subtitle
297
+
287
298
  - 1.73.3
288
299
 
289
300
  - Remove space around endash in legend title for unitless choropleth maps
@@ -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.1
252
+
253
+ - Wait for data to be added before calculating dynamic heights and responsive typography
254
+ - Expose dataset from Map class
255
+
256
+ - 1.74.0
257
+
258
+ - Support quarterly data in SeasonalChart
259
+ - Dont adjust subplots headers if there is no title or subtitle
260
+
250
261
  - 1.73.3
251
262
 
252
263
  - Remove space around endash in legend title for unitless choropleth maps
@@ -1,4 +1,4 @@
1
- __version__ = "1.73.3"
1
+ __version__ = "1.74.1"
2
2
 
3
3
  from .chart import Chart
4
4
  from .choroplethmap import ChoroplethMap
@@ -2,6 +2,7 @@
2
2
  For use with Newsworthy's robot writer and other similar projects.
3
3
  """
4
4
  import types
5
+ import math
5
6
  from .lib import color_fn
6
7
  from .lib.mimetypes import MIME_TYPES
7
8
  from .lib.utils import loadstyle, outline, to_date
@@ -107,15 +108,6 @@ class Chart(object):
107
108
  if height:
108
109
  self._h = int(height)
109
110
 
110
- # Dynamic typography
111
- self._title_font = FontProperties()
112
- # scale up slightly < 600px, scale down slightly > 600px
113
- import math
114
- adjusted_fontsize = math.log(self._h, 600)
115
- self._title_font.set_family(self._nwc_style["title_font"])
116
- self._title_font.set_size(int(adjusted_fontsize * self._style["figure.titlesize"]))
117
- self._title_font.set_weight(self._style["figure.titleweight"])
118
-
119
111
  # Chart elements. Made available for fitting.
120
112
  self._title_elem = None
121
113
  self._subtitle_elem = None
@@ -496,6 +488,14 @@ class Chart(object):
496
488
  self._h = h # This was tentatively set in init. Overwritten here!
497
489
  self._set_size(self._w, h)
498
490
 
491
+ # Dynamic typography
492
+ self._title_font = FontProperties()
493
+ # scale up slightly < 600px, scale down slightly > 600px
494
+ adjusted_fontsize = math.log(self._h, 600)
495
+ self._title_font.set_family(self._nwc_style["title_font"])
496
+ self._title_font.set_size(int(adjusted_fontsize * self._style["figure.titlesize"]))
497
+ self._title_font.set_weight(self._style["figure.titleweight"])
498
+
499
499
  # Legend / data labels
500
500
  if self.legend_title:
501
501
  # Legend can contain data labels (.labels[]),
@@ -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:
@@ -241,3 +241,4 @@ class ChoroplethMap(Map):
241
241
  **label_kwargs,
242
242
  )
243
243
  # self.ax.get_figure().savefig("TST.png", bbox_inches="tight")
244
+ self.df = df
@@ -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")
@@ -1,9 +1,9 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: newsworthycharts
3
- Version: 1.73.3
3
+ Version: 1.74.1
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.3.tar.gz
6
+ Download-URL: https://github.com/jplusplus/newsworthycharts/archive/1.74.1.tar.gz
7
7
  Author: Jens Finnäs and Leo Wallentin, J++ Stockholm
8
8
  Author-email: stockholm@jplusplus.org
9
9
  License: MIT
@@ -186,11 +186,11 @@ These settings are available for all chart types:
186
186
 
187
187
  **SeasonalChart**
188
188
 
189
- _ Inherits from SerialChart _
189
+ *Inherits from SerialChart*
190
190
 
191
191
  **BumpChart**
192
192
 
193
- _ Inherits from SerialChart _
193
+ *Inherits from SerialChart*
194
194
 
195
195
  - label_placement = "right" # [left|right|both|outside|legend]
196
196
  - highlight = None # The label value to of a line to highlight
@@ -213,6 +213,8 @@ _ Inherits from SerialChart _
213
213
 
214
214
  **CategoricalChartWithReference**
215
215
 
216
+ *Inherits from CategoricalChart*
217
+
216
218
  **Map**
217
219
 
218
220
  - `use_bins` = True # If False, the map will be colored by a continuous value
@@ -229,18 +231,17 @@ For example, `se-4` will show Swedish counties, while `se|03-7` will show munici
229
231
 
230
232
  **ChoroplethMap**
231
233
 
232
- _ Inherits from Map _
234
+ *Inherits from Map*
233
235
 
234
- - `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
235
237
 
236
238
  **BubbleMap**
237
239
 
238
- _ Inherits from Map _
240
+ *Inherits from Map*
239
241
 
240
242
  **ProgressChart**
241
243
 
242
- _ Inherits from CategoricalChart _
243
-
244
+ *Inherits from CategoricalChart*
244
245
  - `target` = None # A target value to compare to, often 1 (when using percentages)
245
246
 
246
247
  **RangePlot**
@@ -284,6 +285,16 @@ Roadmap
284
285
  Changelog
285
286
  ---------
286
287
 
288
+ - 1.74.1
289
+
290
+ - Wait for data to be added before calculating dynamic heights and responsive typography
291
+ - Expose dataset from Map class
292
+
293
+ - 1.74.0
294
+
295
+ - Support quarterly data in SeasonalChart
296
+ - Dont adjust subplots headers if there is no title or subtitle
297
+
287
298
  - 1.73.3
288
299
 
289
300
  - Remove space around endash in legend title for unitless choropleth maps