Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents f751651 + 0774df6 commit 49ef5cc83aa23ab868dfdfc9c742714161735d6a @jamesturk jamesturk committed Jan 4, 2013
Showing with 24 additions and 11 deletions.
  1. +5 −0 openstates/oh/__init__.py
  2. +19 −11 openstates/ri/__init__.py
@@ -16,6 +16,8 @@
'start_year': 2009, 'end_year': 2010},
{'name': '2011-2012', 'sessions': ['129'],
'start_year': 2011, 'end_year': 2012},
+ {'name': '2013-2014', 'sessions': ['130'],
+ 'start_year': 2013, 'end_year': 2014},
],
session_details={
'128': { 'display_name': '128th Legislature',
@@ -25,6 +27,9 @@
'display_name': '129th Legislature',
'_scraped_name': '129',
},
+ '130': { 'display_name': '130th Legislature',
+ '_scraped_name': '130',
+ },
},
feature_flags=[ 'events', 'influenceexplorer' ],
_ignored_scraped_sessions=['127', '126', '125', '124', '123', '122']
View
@@ -12,18 +12,26 @@
'upper': {'name': 'Senate', 'title': 'Senator'},
'lower': {'name': 'House', 'title': 'Representative'},
},
- terms=[{'name': '2012',
- 'start_year': 2012,
- 'start_date': datetime.date(2012, 1, 4),
- 'end_year': 2012,
- 'sessions': ['2012']},
- ],
+ terms=[
+ {'name': '2012',
+ 'start_year': 2012,
+ 'start_date': datetime.date(2012, 1, 4),
+ 'end_year': 2012,
+ 'sessions': ['2012']},
+ {'name': '2013',
+ 'start_year': 2013,
+ 'end_year': 2014,
+ 'sessions': ['2013']},
+ ],
feature_flags=['subjects', 'events', 'influenceexplorer'],
- session_details={'2012': {'start_date': datetime.date(2012, 1, 4),
- 'type': 'primary',
- 'display_name': '2012 Regular Session'},
- },
- _ignored_scraped_sessions=['2012', '2011', '2010', '2009', '2008',
+ session_details={
+ '2012': {'start_date': datetime.date(2012, 1, 4),
+ 'type': 'primary',
+ 'display_name': '2012 Regular Session'},
+ '2013': {'type': 'primary',
+ 'display_name': '2013 Regular Session'},
+ },
+ _ignored_scraped_sessions=['2013', '2012', '2011', '2010', '2009', '2008',
'2007']
)

0 comments on commit 49ef5cc

Please sign in to comment.