Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update develop from master #21

Merged
merged 14 commits into from
Mar 12, 2018
Merged

update develop from master #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e0b0994
Merge pull request #13 from mroberge/develop
mroberge Mar 7, 2018
8313ec1
new module and test_module
mroberge Mar 9, 2018
2a54e31
add new imports and requirements
mroberge Mar 9, 2018
eddb1c5
setup basic function and test structure
mroberge Mar 9, 2018
b7b9641
fill out flow_duration() and add test
mroberge Mar 9, 2018
a4c233e
set up flow_duration(), docstrings, tests
mroberge Mar 9, 2018
11b6836
fix docstrings for Sphinx build
mroberge Mar 9, 2018
879ac0e
New notebook describing the flow duration chart.
mroberge Mar 9, 2018
da5f791
New notebook & page in User's Guide
mroberge Mar 10, 2018
aee7b9b
set backend to avoid errors in Travis
mroberge Mar 10, 2018
cb0d29c
second attempt!
mroberge Mar 10, 2018
62229a8
Third attempt
mroberge Mar 10, 2018
bf59770
Fourth attempt
mroberge Mar 10, 2018
db72982
Merge pull request #20 from mroberge/add-chart
mroberge Mar 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
second attempt!
  • Loading branch information
@mroberge
mroberge committed Mar 10, 2018
commit cb0d29c290adebbc8b28ded2c5da78aeb97682e1
5 changes: 5 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
test_requirements = [
# 'pytest'
# 'nose2' doesn't add any extra functionality for me right now.
# Recommended that I use this line to avoid errors in TravisCI
# See https://matplotlib.org/faq/howto_faq.html
# Basically, matplotlib usually uses an 'X11 connection' by default; Travis CI
# does not have this configured, so you need to set your backend explicitly.
matplotlib.use('Agg')
]

setup(
Expand Down
5 changes: 0 additions & 5 deletions tests/test_charts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
from __future__ import absolute_import, print_function
import unittest
import matplotlib
# Recommended that I use this line to avoid errors in TravisCI
# See https://matplotlib.org/faq/howto_faq.html
# Basically, matplotlib usually uses an 'X11 connection' by default; Travis CI
# does not have this configured, so you need to set your backend explicitly.
matplotlib.use('Agg')
import pandas as pd

from hydrofunctions import charts
Expand Down