Skip to content

Commit

Permalink
Merge pull request #114 from SABS-R3-Epidemiology/hide-flu-data
Browse files Browse the repository at this point in the history
fix tests
  • Loading branch information
FarmHJ authored Oct 31, 2022
2 parents da925e2 + cc97339 commit 0d116f7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
10 changes: 5 additions & 5 deletions seirmo/plots/_figures.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def add_data(
go.Bar(
x=data[time_key],
y=data[inc_key],
name='cases'
name='cases',
)
)

Expand Down Expand Up @@ -110,8 +110,8 @@ def _update_axis_labels(self, x_label, y_label):
# does not match the old one if it already exist;
if (old_y_label is not None) and (old_y_label != y_label):
warnings.warn(
'''The incidence key does not match the previous incidence label.
The y label was set to the new incidence key,
'''The incidence key does not match the previous incidence
label. The y label was set to the new incidence key,
but may no longer be appropriate for
the previously set data.''')

Expand Down Expand Up @@ -199,8 +199,8 @@ def _update_axis_labels(self, x_label, y_label):
# does not match the old one if it already exist;
if (old_y_label is not None) and (old_y_label != y_label):
warnings.warn(
'''The incidence key does not match the previous incidence label.
The y label was set to the new incidence key,
'''The incidence key does not match the previous incidence
label. The y label was set to the new incidence key,
but may no longer be appropriate for
the previously set data.''')

Expand Down
2 changes: 1 addition & 1 deletion seirmo/tests/test_plotters.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def test_deletion_function(self):
figure.begin(1, 1)
fig_num = figure[0].number
self.assertTrue(matplotlib.pyplot.fignum_exists(fig_num))
del(figure)
del figure
self.assertFalse(matplotlib.pyplot.fignum_exists(fig_num))

@mock.patch("seirmo.plots._plot_from_numpy.plt")
Expand Down
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,10 @@ def get_readme():
'numpy',
'pandas',
'parameterized',
'pints @ git+git://github.com/pints-team/pints.git#egg=pints-latest',
'pints',
'plotly',
'scipy',
],
dependency_links=[
"git+git://github.com/pints-team/pints.git#egg=pints-latest",
],

extras_require={
'docs': [
# Sphinx for doc generation. Version 1.7.3 has a bug:
Expand All @@ -86,4 +82,4 @@ def get_readme():
'flake8>=3',
],
},
)
)

0 comments on commit 0d116f7

Please sign in to comment.