Skip to content

Commit

Permalink
Getting celery_beat out of tracking
Browse files Browse the repository at this point in the history 
A bit more testing, and getting requirements up to date
  • Loading branch information
@abkfenris
abkfenris committed Jul 13, 2015
1 parent df89963 commit 78410b6
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -59,3 +59,5 @@ target/
*.ipynb
fabhosts.py
tox.ini
celerybeat.pid
celerybeat-schedule
Binary file removed celerybeat-schedule
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion requirements/core.txt
View file
Expand Up @@ -30,7 +30,7 @@ arrow==0.6.0
beautifulsoup4==4.4.0
blinker==1.3
docopt==0.6.2
ipaddress==1.0.9
ipaddress==1.0.10
itsdangerous==0.24
Jinja2==2.7.3
Mako==1.0.1
Expand Down
85 changes: 85 additions & 0 deletions tests/fixture/h2oline_soup_get_dt_cfs
View file
@@ -0,0 +1,85 @@
interactions:
- request:
body: null
headers:
Accept: ['*/*']
Accept-Encoding: ['gzip, deflate']
Connection: [keep-alive]
User-Agent: [python-requests/2.6.0 CPython/2.7.9 Darwin/14.4.0]
method: GET
uri: http://www.h2oline.com/default.aspx?pg=si&op=235127
response:
body: {string: !!python/unicode "\r\n\r\n<html>\r\n<head><meta http-equiv=\"Content-Type\"
content=\"text/html\" /><meta name=\"keywords\" content=\"Fishing, boating,
kayaking, levels, flows, guages, gages, gage, guage, fish, boat, raft, rafting,
whitewater, white water, river running, salmon, fish, TransCanada, Brascan,
Waterline, H2O-Line, H2OLine\" /><meta name=\"description\" content=\"River
flow information available by toll-free phone and on the web.\" /><title>\r\n\tSite
235127\r\n</title><link href=\"default.css\" media=\"screen\" rel=\"stylesheet\"
type=\"text/css\" /><link href=\"default.css\" media=\"print\" rel=\"stylesheet\"
type=\"text/css\" /></head>\r\n<body>\r\n<form name=\"ctl01\" method=\"post\"
action=\"default.aspx?pg=si&amp;op=235127\" id=\"ctl01\">\r\n<input type=\"hidden\"
name=\"__VIEWSTATE\" id=\"__VIEWSTATE\" value=\"/wEPDwUJMjc4MzY3MjYwD2QWAgIDD2QWDAIHDxYCHgRUZXh0BcQDPGEgaHJlZj0nZGVmYXVsdC5hc3B4Jz5XYXRlcmxpbmUgSG9tZTwvYT4mbmJzcDt8Jm5ic3A7PGEgaHJlZj0nZGVmYXVsdC5hc3B4P3BnPXAyJz5TdGF0ZSBTaXRlIENvZGUgSW5kZXg8L2E+Jm5ic3A7fCZuYnNwOzxhIGhyZWY9J2RlZmF1bHQuYXNweD9wZz1wMyc+ODAwIFJlcG9ydCBOdW1iZXJzPC9hPiZuYnNwO3wmbmJzcDs8YSBocmVmPSdkZWZhdWx0LmFzcHg/cGc9cDQnPkZsb3dDYXN0JmNvcHk7IFNpdGVzPC9hPiZuYnNwO3wmbmJzcDs8YSBocmVmPSdkZWZhdWx0LmFzcHg/cGc9c2kmb3A9MjM1MTI3JmZtdD1wZGYnPlByaW50YWJsZSBQREY8L2E+PGJyPjxicj48YSBocmVmPSdkZWZhdWx0LmFzcHg/cGc9Y28mb3A9UkVMJz5CYWNrIHRvIEJyb29rZmllbGQgUmVuZXdhYmxlIFBvd2VyPC9hPiB8IDxhIGhyZWY9J2RlZmF1bHQuYXNweD9wZz1zdCZvcD1NRSc+QmFjayB0byBNYWluZTwvYT5kAgkPDxYCHgdWaXNpYmxlaGQWBAIBDw8WBB8AZR8BaGRkAgMPDxYCHwFoZGQCCw9kFgQCAQ8PFgIfAAX2Dg0KICAgIDx0YWJsZSB3aWR0aD02MTBweCBib3JkZXI9MCBjZWxscGFkZGluZz0wIGNlbGxzcGFjaW5nPTA+DQogICAgPHRyPjx0ZCB2YWxpZ249dG9wIGFsaWduPWxlZnQ+DQogICAgPHAgaWQ9UFBTdHlsZTItUD4NCiAgICAgICAgPHNwYW4gaWQ9UFBTdHlsZTMtQz4yMzUxMjcgUkFQSUQgUklWRVIgTUlERExFIERBTSBPTiBSSUNIQVJEU09OIExBS0UsIE1FPC9zcGFuPjxzcGFuIGlkPUZvb3Rlci1DPjxicj4gUFVCTElTSEVEIE9OIEpVTCAxMywgMjAxNSBBVCAwNjozMToyNyAgICAgICAgLSBFWFBJUkVTIEpVTCAxMyAxMTo1OSBQTTxicj48L3NwYW4+DQogICAgPC9wPg0KICAgIDwvdGQ+PC90cj4NCiAgICA8L3RhYmxlPg0KDQo8IS0tI0lOQ0xVREUgRklMRT0iaW5jbHVkZXMveEJyb29rZmllbGQgUmVuZXdhYmxlIFBvd2VyIC0gTWFpbmUudHh0Ii0tPg0KDQogICAgPHRhYmxlIHdpZHRoPTYxMHB4IGJvcmRlcj0wIGNlbGxwYWRkaW5nPTAgY2VsbHNwYWNpbmc9MD4NCiAgICA8dHI+PHRkIHZhbGlnbj10b3AgYWxpZ249bGVmdD4NCiAgICA8cCBpZD1QUFN0eWxlNC1QPg0KICAgICAgICA8c3BhbiBpZD1Gb290ZXItQz48YnI+IA0KIEZvciB0aGUgUmFwaWQgUml2ZXIgYXQgQnJvb2tmaWVsZCBSZW5ld2FibGUgUG93ZXIncyBNaWRkbGUgRGFtIG9uIFJpY2hhcmRzb24gTGFrZSBpbiBNRTxicj48YnI+IDxicj4gQXQgNzoxMCBQTSBTdW4gSlVMIDEyLCB0aGUgdG90YWwgZmxvdyBiZWxvdyB0aGUgZGFtIHdhcyA4MDAgQ0ZTPGJyPlJlYWRpbmdzIGF2YWlsYWJsZSBmb3IgdGhpcyBmbG93IGhhdmUgbm90IGNoYW5nZWQgc2lnbmlmaWNhbnRseSBhcyBvZiA2OjI4IEFNIHRvZGF5PGJyPiA8YnI+IFRoZSBmb2xsb3dpbmcgZm9yZWNhc3QgZm9yIGZsb3dzIGJlbG93IHRoZSBkYW0gaXMgYmFzZWQgb24gdGhlIG1vc3QgIHJlY2VudCBsb2FkIGZvcmVjYXN0IGZyb20gdGhlIE5ldyBFbmdsYW5kIEluZGVwZW5kZW50IFN5c3RlbSBvcGVyYXRvciAgd2hpY2ggc2NoZWR1bGVzIGFuZCBkaXNwYXRjaGVzIGdlbmVyYXRpb24gdGhyb3VnaG91dCB0aGUgcmVnaW9uOiAgPGJyPlVudGlsIDExOjU5IFBNIHRvZGF5LCBNb24sIDgwMCBDRlM8YnI+IDxicj4gRmxvd3Mgd2lsbCBvZnRlbiBkaWZmZXIgZnJvbSB0aGlzIGZvcmVjYXN0IGZvciByZWFzb25zIGJleW9uZCB0aGUgY29tcGFueSdzIGNvbnRyb2wgaW5jbHVkaW5nIHJlZ2lvbmFsIGVuZXJneSBkZW1hbmQgYW5kIGNsZWFyaW5nIHByaWNlLCBzeXN0ZW0gb3BlcmF0aW5nIGNvbmRpdGlvbnMsIGVxdWlwbWVudCBmYWlsdXJlcyBhbmQgd2VhdGhlci48YnI+IDxicj4gQWxsIHB1Ymxpc2hlZCBmbG93cyBhcmUgYXBwcm94aW1hdGUgYW5kIGZvcmVjYXN0cyBhcmUgZXN0aW1hdGVzIG9ubHkuIEFjdHVhbCBmbG93cyB3aWxsIHZhcnkgYW5kIGNhbiBjaGFuZ2UgcXVpY2tseSBhdCBhbnkgdGltZS4gQWx3YXlzIGJlIGFsZXJ0IGFuZCB3ZWFyIGFuIGFwcHJvdmVkIGZsb3RhdGlvbiBkZXZpY2UuIE5ldmVyIGdvIGluIG9yIG5lYXIgdGhlIHdhdGVyIHVudGlsIHlvdSBrbm93IGFuZCBhY2NlcHQgdGhlIHJpc2tzIHlvdSBhcmUgYXNzdW1pbmcgYnkgYmVpbmcgaW4gdGhpcyBhcmVhITxicj48YnI+Rm9yIGN1cnJlbnQgZmxvb2QgcG90ZW50aWFsLCBmbG9vZCBjb25kaXRpb25zLCBvciBmbG9vZCBmb3JlY2FzdHMgcGxlYXNlIGNvbnRhY3QgdGhlIE94Zm9yZCBDb3VudHkgRW1lcmdlbmN5IE1hbmFnZW1lbnQgQWdlbmN5IGF0ICgyMDcpIDc0My02MzM2Ljxicj48YnI+PGJyPiA8YnI+PGJyPiA8YSBocmVmPSIvc3Jjcy8yMDE1X1JhcGlkX2FuZF9NYWdhbGxvd2F5LnBkZiI+QU5OVUFMIFJFTEVBU0UgdXNpbmcgcGRmIEZPUiAyMDE1PC9hPjxicj48L3NwYW4+DQogICAgPC9wPg0KICAgIDwvdGQ+PC90cj4NCiAgICA8L3RhYmxlPg0KZGQCAw8WAh8ABagDPGRpdiBjbGFzcz1zaXRlX2Zvb3Rlcj5UaGUgbW9zdCByZWNlbnQgcmVwb3J0IGZvciB0aGlzIHNpdGUgaXMgYWxzbyBhdmFpbGFibGUgb24gPGEgaHJlZj0nZGVmYXVsdC5hc3B4P3BnPXAxMSc+V2F0ZXJsaW5lJ3MgVG9sbC1GcmVlSG90bGluZTwvYT4uPGJyPkJvYXRlcnMgY2FsbCAxLTgwMCA0NTItMTczNy4gQW5nbGVycyBjYWxsIDEtODAwIDQ1Mi0xNzQyLjxicj5BdCB0aGUgdm9pY2UgcHJvbXB0LCBlbnRlciB0aGUgc2l4LWRpZ2l0IGNvZGUgZm9yIHRoaXMgc2l0ZS48YnI+PGJyPjxicj48YSBocmVmPSdkZWZhdWx0LmFzcHg/cGc9Y28mb3A9UkVMJz5CYWNrIHRvIEJyb29rZmllbGQgUmVuZXdhYmxlIFBvd2VyPC9hPiB8IDxhIGhyZWY9J2RlZmF1bHQuYXNweD9wZz1zdCZvcD1NRSc+QmFjayB0byBNYWluZTwvYT48YnI+PGJyPjwvZGl2PmQCDQ8PFgIfAGVkZAIPDxYCHwAFuwI8YSBocmVmPSdkZWZhdWx0LmFzcHgnPldhdGVybGluZSBIb21lPC9hPiZuYnNwO3wmbmJzcDs8YSBocmVmPSdkZWZhdWx0LmFzcHg/cGc9cDInPlN0YXRlIFNpdGUgQ29kZSBJbmRleDwvYT4mbmJzcDt8Jm5ic3A7PGEgaHJlZj0nZGVmYXVsdC5hc3B4P3BnPXAzJz44MDAgUmVwb3J0IE51bWJlcnM8L2E+Jm5ic3A7fCZuYnNwOzxhIGhyZWY9J2RlZmF1bHQuYXNweD9wZz1wNCc+Rmxvd0Nhc3QmY29weTsgU2l0ZXM8L2E+Jm5ic3A7fCZuYnNwOzxhIGhyZWY9J2RlZmF1bHQuYXNweD9wZz1zaSZvcD0yMzUxMjcmZm10PXBkZic+UHJpbnRhYmxlIFBERjwvYT5kAhEPDxYCHwAFqgFXYXRlcmxpbmUgaXMgYW4gZWxlY3Ryb25pYyBwdWJsaWNhdGlvbiBvZiBWaXJ0dWFsIFB1Ymxpc2hpbmcgTExDLjxicj5Db3B5cmlnaHQgJmNvcHk7IDE5OTIgLSAyMDE1IFZpcnR1YWwgUHVibGlzaGluZyBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZDxicj5odHRwOi8vd3d3Lmgyb2xpbmUuY29tPGJyPmRkZA4oYZ7d5GG4f3IIVK0cH4sy9zf4\"
/>\r\n\r\n<input type=\"hidden\" name=\"__VIEWSTATEGENERATOR\" id=\"__VIEWSTATEGENERATOR\"
value=\"CA0B0334\" />\r\n\r\n<div class=left_bar>\r\n</div>\r\n\r\n<div class=cont_bar>\r\n\r\n\t<div
class=cont_head>\r\n\t\t<div class=center_sec>\r\n\t\t\t\r\n\t\t\t<div id=\"head_logo_sec\"
class=\"head_sec\">\r\n\t\r\n\t\t\t\t<img src=\"images/wline_logo_lt_blue.jpg\"
width=255 height=80 border=0><br>\r\n\t\t\t\tFlowCast&copy;<br>\r\n\t\t\t\r\n</div>\r\n\t\t\t\r\n\t\t\t<a
href='default.aspx'>Waterline Home</a>&nbsp;|&nbsp;<a href='default.aspx?pg=p2'>State
Site Code Index</a>&nbsp;|&nbsp;<a href='default.aspx?pg=p3'>800 Report Numbers</a>&nbsp;|&nbsp;<a
href='default.aspx?pg=p4'>FlowCast&copy; Sites</a>&nbsp;|&nbsp;<a href='default.aspx?pg=si&op=235127&fmt=pdf'>Printable
PDF</a><br><br><a href='default.aspx?pg=co&op=REL'>Back to Brookfield Renewable
Power</a> | <a href='default.aspx?pg=st&op=ME'>Back to Maine</a>\r\n\t\t</div>\r\n\t</div>\r\n\r\n\t<div
class=cont_main id=cont_main>\r\n\t\t\r\n\t\t<div id=\"txt_content_div\" class=\"txt_content\">\r\n\t\r\n\t\t\t<span
id=\"txt_content\">\r\n <table width=610px border=0 cellpadding=0 cellspacing=0>\r\n
\ <tr><td valign=top align=left>\r\n <p id=PPStyle2-P>\r\n <span
id=PPStyle3-C>235127 RAPID RIVER MIDDLE DAM ON RICHARDSON LAKE, ME</span><span
id=Footer-C><br> PUBLISHED ON JUL 13, 2015 AT 06:31:27 - EXPIRES JUL
13 11:59 PM<br></span>\r\n </p>\r\n </td></tr>\r\n </table>\r\n\r\n<!--#INCLUDE
FILE=\"includes/xBrookfield Renewable Power - Maine.txt\"-->\r\n\r\n <table
width=610px border=0 cellpadding=0 cellspacing=0>\r\n <tr><td valign=top
align=left>\r\n <p id=PPStyle4-P>\r\n <span id=Footer-C><br> \r\n
For the Rapid River at Brookfield Renewable Power's Middle Dam on Richardson
Lake in ME<br><br> <br> At 7:10 PM Sun JUL 12, the total flow below the dam
was 800 CFS<br>Readings available for this flow have not changed significantly
as of 6:28 AM today<br> <br> The following forecast for flows below the dam
is based on the most recent load forecast from the New England Independent
System operator which schedules and dispatches generation throughout the
region: <br>Until 11:59 PM today, Mon, 800 CFS<br> <br> Flows will often
differ from this forecast for reasons beyond the company's control including
regional energy demand and clearing price, system operating conditions, equipment
failures and weather.<br> <br> All published flows are approximate and forecasts
are estimates only. Actual flows will vary and can change quickly at any time.
Always be alert and wear an approved flotation device. Never go in or near
the water until you know and accept the risks you are assuming by being in
this area!<br><br>For current flood potential, flood conditions, or flood
forecasts please contact the Oxford County Emergency Management Agency at
(207) 743-6336.<br><br><br> <br><br> <a href=\"/srcs/2015_Rapid_and_Magalloway.pdf\">ANNUAL
RELEASE using pdf FOR 2015</a><br></span>\r\n </p>\r\n </td></tr>\r\n
\ </table>\r\n</span>\r\n\t\t\t<div class=site_footer>The most recent report
for this site is also available on <a href='default.aspx?pg=p11'>Waterline's
Toll-FreeHotline</a>.<br>Boaters call 1-800 452-1737. Anglers call 1-800 452-1742.<br>At
the voice prompt, enter the six-digit code for this site.<br><br><br><a href='default.aspx?pg=co&op=REL'>Back
to Brookfield Renewable Power</a> | <a href='default.aspx?pg=st&op=ME'>Back
to Maine</a><br><br></div>\r\n\t\t\r\n</div>\r\n\t\t<div class=txt_links><span
id=\"txt_links\"></span></div>\r\n\t</div>\r\n\r\n\t<div class=cont_head>\r\n\t\t<div
class=center_sec>\r\n\t\t\t<a href='default.aspx'>Waterline Home</a>&nbsp;|&nbsp;<a
href='default.aspx?pg=p2'>State Site Code Index</a>&nbsp;|&nbsp;<a href='default.aspx?pg=p3'>800
Report Numbers</a>&nbsp;|&nbsp;<a href='default.aspx?pg=p4'>FlowCast&copy;
Sites</a>&nbsp;|&nbsp;<a href='default.aspx?pg=si&op=235127&fmt=pdf'>Printable
PDF</a>\r\n\t\t\t<br><br>\r\n\t\t\t<span id=z-Bottom-of-Form-C>\r\n\t\t\t\t<span
id=\"cr_foot\">Waterline is an electronic publication of Virtual Publishing
LLC.<br>Copyright &copy; 1992 - 2015 Virtual Publishing LLC All Rights Reserved<br>http://www.h2oline.com<br></span>\r\n\t\t\t</span>\r\n\r\n\t\t</div>\r\n\t</div>\r\n\r\n\r\n</div>\r\n\r\n<div
class=right_bar>\r\n</div>\r\n\r\n\r\n\r\n</form>\r\n\t\r\n</body>\r\n</html>"}
headers:
cache-control: [no-cache]
content-length: ['9497']
content-type: [text/html; charset=utf-8]
date: ['Mon, 13 Jul 2015 10:35:19 GMT']
expires: ['-1']
pragma: [no-cache]
server: [Microsoft-IIS/7.5]
x-aspnet-version: [2.0.50727]
x-powered-by: [ASP.NET]
status: {code: 200, message: OK}
version: 1
7 changes: 7 additions & 0 deletions tests/test_remote_h2oline.py
View file
Expand Up @@ -33,3 +33,10 @@ def test_get_dt_cfs(self):
dt, value = h2oline.get_dt_cfs(self.SITE_NUM)
assert type(dt) == datetime.datetime
assert type(value) == float

@my_vcr.use_cassette('tests/fixture/h2oline_soup_get_dt_cfs')
def test_soup_get_dt_cfs(self):
soup = h2oline.get_soup(self.SITE_NUM)
dt, value = h2oline.get_dt_cfs(self.SITE_NUM, soup=soup)
assert type(dt) == datetime.datetime
assert type(value) == float

0 comments on commit 78410b6

Please sign in to comment.