Skip to content

Commit

Permalink
Merge pull request #338 from jdebacker/tax31
Browse files Browse the repository at this point in the history 
Updates for new dependency versions
  • Loading branch information
@jdebacker
jdebacker committed Mar 19, 2021
2 parents bfafa14 + 282e6a4 commit b93aff4
Show file tree
Hide file tree
Showing 8 changed files with 198 additions and 226 deletions.
27 changes: 0 additions & 27 deletions .travis.yml
View file

This file was deleted.

48 changes: 24 additions & 24 deletions ccc/calculator.py
View file
Expand Up @@ -1321,12 +1321,12 @@ def bubble_widget(self, calc, output_variable='mettr',
'x': [0, .15, .35, .6]})
p_legend = figure(height=150, width=380, x_range=(-0.075, 75),
title='Asset Amount', tools='')
p_legend.circle(y=None, x='x', size='size', source=legend_cds,
color=BLUE, fill_alpha=.4, alpha=.4,
line_color="#333333")
l1 = LabelSet(y=None, x='x', text='label', x_offset=-20,
y_offset=-50, source=legend_cds)
p_legend.add_layout(l1)
# p_legend.circle(y=None, x='x', size='size', source=legend_cds,
# color=BLUE, fill_alpha=.4, alpha=.4,
# line_color="#333333")
# l1 = LabelSet(y=None, x='x', text='label', x_offset=-20,
# y_offset=-50, source=legend_cds)
# p_legend.add_layout(l1)
p_legend.axis.visible = False
p_legend.grid.grid_line_color = None
p_legend.toolbar.active_drag = None
Expand Down Expand Up @@ -1366,12 +1366,12 @@ def bubble_widget(self, calc, output_variable='mettr',
# Define and add a legend
p2_legend = figure(height=150, width=380, x_range=(-0.075, .75),
title='Asset Amount', tools='')
p2_legend.circle(y=None, x='x', size='size', source=legend_cds,
color=RED, fill_alpha=.4, alpha=.4,
line_color="#333333")
l2 = LabelSet(y=None, x='x', text='label', x_offset=-20,
y_offset=-50, source=legend_cds)
p2_legend.add_layout(l2)
# p2_legend.circle(y=None, x='x', size='size', source=legend_cds,
# color=RED, fill_alpha=.4, alpha=.4,
# line_color="#333333")
# l2 = LabelSet(y=None, x='x', text='label', x_offset=-20,
# y_offset=-50, source=legend_cds)
# p2_legend.add_layout(l2)
p2_legend.axis.visible = False
p2_legend.grid.grid_line_color = None
p2_legend.toolbar.active_drag = None
Expand Down Expand Up @@ -1611,12 +1611,12 @@ def asset_bubble(self, calc, output_variable='mettr_mix',
'x': [0, .15, .35, .6]})
p_legend = figure(height=150, width=380, x_range=(-0.075, 75),
title='Asset Amount', tools='')
p_legend.circle(y=None, x='x', size='size', source=legend_cds,
color=BLUE, fill_alpha=.4, alpha=.4,
line_color="#333333")
l1 = LabelSet(y=None, x='x', text='label', x_offset=-20,
y_offset=-50, source=legend_cds)
p_legend.add_layout(l1)
# p_legend.circle(y=None, x='x', size='size', source=legend_cds,
# color=BLUE, fill_alpha=.4, alpha=.4,
# line_color="#333333")
# l1 = LabelSet(y=None, x='x', text='label', x_offset=-20,
# y_offset=-50, source=legend_cds)
# p_legend.add_layout(l1)
p_legend.axis.visible = False
p_legend.grid.grid_line_color = None
p_legend.toolbar.active_drag = None
Expand Down Expand Up @@ -1673,12 +1673,12 @@ def asset_bubble(self, calc, output_variable='mettr_mix',
# Define and add a legend
p2_legend = figure(height=150, width=380, x_range=(-0.075, .75),
title='Asset Amount', tools='')
p2_legend.circle(y=None, x='x', size='size', source=legend_cds,
color=RED, fill_alpha=.4, alpha=.4,
line_color="#333333")
l2 = LabelSet(y=None, x='x', text='label', x_offset=-20,
y_offset=-50, source=legend_cds)
p2_legend.add_layout(l2)
# p2_legend.circle(y=None, x='x', size='size', source=legend_cds,
# color=RED, fill_alpha=.4, alpha=.4,
# line_color="#333333")
# l2 = LabelSet(y=None, x='x', text='label', x_offset=-20,
# y_offset=-50, source=legend_cds)
# p2_legend.add_layout(l2)
p2_legend.axis.visible = False
p2_legend.grid.grid_line_color = None
p2_legend.toolbar.active_drag = None
Expand Down

0 comments on commit b93aff4

Please sign in to comment.