Skip to content

Commit

Permalink
Merge 89c499d into ce0924c
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesturk committed Apr 23, 2020
2 parents ce0924c + 89c499d commit 3b29ee1
Show file tree
Hide file tree
Showing 51 changed files with 221 additions and 168 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,3 @@ jobs:
- coveralls
- script: ./scripts/lint_yaml.py
name: "Check YAML"
# - stage: deploy
# script: ./scripts/to_database.py
# name: "To Database"
# if: branch = master AND repo = openstates/people AND type = push
# env:
# - OCD_DATABASE_NAME=openstatesorg
# - OCD_DATABASE_USER=travis
# - secure: "uZ4MCXTp6tYXAXYrtUmkzrQk4bvQV+aBjd5dfLqIfY6f2Tj44q8PH65M65Rp3qpue8rVvWU2QJCLnWafVl8+GjlyyoDsyBbaNlUboqfh6AmIp+IjlVO/eo7JgtWXizx8mgC2WkcUk3gPxuW/ydfU7+D6wwioS1v8MhMXf84dhydKGsC6eX2eyvSXVG5b7rEmGCIxcStWcFCRPZkgby2ZXunKcjAUPI9uVzu0iL4JAtIT3Dn9tMcTI7Ag1+H4mbRVw4USZbqQZ4drARNWRXGnkpOgHTORpoKjubZ2G5MKqjb7gXCSzm+rvW6VgDbmozNf1HgCH2dYm/rlYZqm3BomjLSOttoorPQ+9cTzu7es9US9/53+3XT6Yu4NM1XTAI8Z1aP1q/dqE51U87cUs4kbjB1UJOqFkfto7rGy7aFQwwaJUuks4aau81dixOb/P7X/M9qQobt7yiUDdXzukL7bII8qC4PwEWn+PKZZad9PFDCAIgJIDNUjuFRqGiQpHMOwLSMBeOs6NnR1ZX5QePCUFPCZo3euqukj/W2e3lIEiQefhyPAlYAg3cDaOSpjcrrLjbWt4lnzYC+XyTuQDMN2zgL3yT2OvSxyJWNhhW0t3u4/M3uQ0icFnqkmm4YFRXCvSfIm2IdfUy+uStJbb8+Kr9Gb7kqh/JhOv4OziIGZOF0="
# - secure: "bMA1TwPv/2NqtkwKUkI9DILvcIczhlQcYd5t3pV67g3n1f64fOZq73xDJ00ULZNEDk8Ue4nHk+aCTVTjRGhqGyYXPtnsnEhkDfQAh1w4iqxHJ2gvOAfTNwSsy2d41dGG2DyR2lXEkVAzfRYXK9nk6SgFFVJLAfR/CKwBqZhyjnmOmXqA/hSwjjY23x5Q00yFN39F60iHwX86GkEv1hF3ytMJ1vSc73DbrWktpxgXePTG/8ftIsyIhuwUr1UiZ5ZWpLEV90dkB4EAR40ZoGRApjWZRhmjBY49Qa8hR+PFkpI6UEyD6nQPSW/xD11ot/ENBBLpXn3bFU3XKafEdWHuwZKoNT3gIL2mZDqQMqRZmS5FEJoW9BWZgbNwYNqbKwHFbrm2KthKl0sZHGqfamIwXJsf0xFmlMbPgM+ZO+E4IeP1Zr8B7KZrMpIjA1AbjrzxGAgjdZ7jNjdoiCRu1aH291JNBr3IfFfO0rHRZ/DdJDDiZxQZjrlwgq++XkKhzst1bkO/u5U8mcnQYyVNjxRh7IW2Uqg81dEUYHb1NWprakx9VuIUCIKb13nGVy/mMfCIa/Pxp1lFDmGv6yx8Fzyz728zjwM8IZbKLginai9MNi3BDU7/Q3gICV4WkER8m2rwy50U6euYMmcbrl6ooAf06EgH8qZHnj80fkYCwZe//KM="
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: Holmes
party:
- name: Republican
- name: Democratic
end_date: '2013-01-02'
roles:
- district: '26'
jurisdiction: ocd-jurisdiction/country:us/state:ak/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: Bell
party:
- name: Independent
- name: Republican
end_date: 2015-01-01
roles:
- district: '22'
jurisdiction: ocd-jurisdiction/country:us/state:ar/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: Begay
party:
- name: Republican
- name: Democratic
end_date: '2015-11-23'
roles:
- district: '7'
jurisdiction: ocd-jurisdiction/country:us/state:az/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: Fletcher
party:
- name: Independent
- name: Republican
end_date: 2012-12-31
roles:
- district: '75'
jurisdiction: ocd-jurisdiction/country:us/state:ca/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Stephen Allison
given_name: Stephen
family_name: Allison
party:
- name: Democratic
- name: Republican
roles:
- district: '8'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ middle_name: T.
party:
- name: Democratic
- name: Independent
end_date: "2006-01-01"
roles:
- district: '15'
jurisdiction: ocd-jurisdiction/country:us/state:il/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Paul D.
family_name: Froehlich
party:
- name: Republican
end_date: "2007-06-01"
- name: Democratic
roles:
- district: '56'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: Pauls
party:
- name: Republican
- name: Democratic
end_date: "2014-05-01"
roles:
- district: '102'
jurisdiction: ocd-jurisdiction/country:us/state:ks/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Denver
family_name: Butler
party:
- name: Democratic
end_date: "2015-01-01"
- name: Republican
roles:
- district: '38'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Troy
family_name: Hebert
party:
- name: Democratic
end_date: "2010-03-01"
- name: Independent
roles: []
sources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ other_identifiers:
scheme: legacy_openstates
party:
- name: Republican
end_date: "2019-01-03"
- name: Independent
roles:
- district: '16'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ middle_name: C.
party:
- name: Independent
- name: Republican
end_date: "2015-07-22"
roles:
- district: '118'
jurisdiction: ocd-jurisdiction/country:us/state:me/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: English
party:
- name: Independent
- name: Democratic
end_date: "2015-01-01"
roles:
- district: '68'
jurisdiction: ocd-jurisdiction/country:us/state:mo/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: Black
party:
- name: Republican
- name: Democratic
end_date: "2014-11-05"
roles:
- district: '117'
jurisdiction: ocd-jurisdiction/country:us/state:mo/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ id: ocd-person/83f9f72e-ec2d-4351-a227-d8a6aec18eed
name: Angela Cockerham
party:
- name: Democratic
end_date: "2019-01-01"
- name: Independent
roles:
- district: '96'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ id: ocd-person/b339d980-af38-4e76-b53c-215c26191cc1
name: Kevin Horan
party:
- name: Democratic
- name: Independent
roles:
- district: '24'
jurisdiction: ocd-jurisdiction/country:us/state:ms/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ id: ocd-person/d247f852-5545-40b2-b974-757b73b1e807
name: Michael T. Evans
party:
- name: Democratic
end_date: "2020-01-01"
- name: Independent
roles:
- district: '43'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ id: ocd-person/0fe14c13-4616-4b4d-9652-0ff7a55c1475
name: Nick Bain
party:
- name: Democratic
end_date: "2019-03-01"
- name: Republican
roles:
- district: '2'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Alice Harden
given_name: Alice
family_name: Harden
party:
- name: Republican
- name: Democratic
roles:
- district: '28'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ given_name: Bennie
family_name: Turner
middle_name: L
party:
- name: Republican
- name: Democratic
roles:
- district: '16'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: David Gibbs
given_name: David
family_name: Gibbs
party:
- name: Republican
- name: Democratic
roles:
- district: '36'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Joe C. Gardner
given_name: Joe C.
family_name: Gardner
party:
- name: Republican
- name: Democratic
roles:
- district: '11'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: Tine
party:
- name: Independent
- name: Democratic
end_date: '2015-01-01'
roles:
- district: '6'
jurisdiction: ocd-jurisdiction/country:us/state:nc/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ given_name: Waldemar
family_name: "Quiles Rodr\xEDguez"
party:
- name: Partido Nuevo Progresista
- name: Partido Nuevo Progresista
roles:
- district: '22'
jurisdiction: ocd-jurisdiction/country:us/territory:pr/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Edward J.
family_name: O'Neill
party:
- name: Independent
end_date: "2016-01-01"
- name: Republican
roles:
- district: '17'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ middle_name: E
party:
- name: Republican
- name: Democratic
end_date: "2010-01-01"
roles:
- district: '17'
jurisdiction: ocd-jurisdiction/country:us/state:sd/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Jenna
family_name: Haggar
party:
- name: Independent
end_date: "2012-12-31"
- name: Republican
roles:
- district: '10'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Jim
family_name: Bradford
party:
- name: Republican
end_date: "2009-01-01"
- name: Democratic
roles:
- district: '27'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Kent Williams
given_name: Kent
family_name: Williams
party:
- name: Carter County Republican
- name: Independent
roles:
- district: '4'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Aaron
family_name: "Pe\xF1a"
party:
- name: Democratic
end_date: "2012-12-31"
- name: Republican
roles:
- district: '40'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Allan
family_name: Ritter
party:
- name: Democratic
end_date: "2010-12-31"
- name: Republican
roles:
- district: '21'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Rick Galindo
given_name: Rick
family_name: Galindo
party:
- name: Democratic
- name: Republican
roles:
- district: '117'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Kenneth Sheets
given_name: Kenneth
family_name: Sheets
party:
- name: Democratic
- name: Republican
roles:
- district: '107'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ given_name: Gilbert
family_name: "Pe\xF1a"
party:
- name: Democratic
- name: Republican
roles:
- district: '144'
jurisdiction: ocd-jurisdiction/country:us/state:tx/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ middle_name: D
party:
- name: Independent
- name: Democratic
end_date: "2014-06-30"
roles:
- district: '74'
jurisdiction: ocd-jurisdiction/country:us/state:va/government
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
id: ocd-person/35504508-c008-4ecd-869f-6d8e33a4ad56
name: Brian Cina
party:
- name: Progressive
- name: Progressive/Democratic
roles:
- district: Chittenden-6-4
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
id: ocd-person/1f501dde-37ba-49b3-ac83-0c77102ed8c3
name: Mari Cordes
party:
- name: Democratic/Progressive
- name: Democratic
- name: Progressive
roles:
- district: Addison-4
jurisdiction: ocd-jurisdiction/country:us/state:vt/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ family_name: Zuckerman
middle_name: E.
party:
- name: Progressive/Democratic
- name: Progressive
roles:
- district: Chittenden-3-4
jurisdiction: ocd-jurisdiction/country:us/state:vt/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ family_name: Olsen
party:
- name: Independent
- name: Republican
end_date: "2013-12-31"
roles:
- district: Windham-Bennington-Windsor-1
jurisdiction: ocd-jurisdiction/country:us/state:vt/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ given_name: Sarah
family_name: Edwards
middle_name: R
party:
- name: Progressive
- name: Democratic
- name: Progressive/Democratic
roles:
- district: Windham-3-3
jurisdiction: ocd-jurisdiction/country:us/state:vt/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ name: Susan H Davis
given_name: Susan
family_name: Davis
party:
- name: Progressive
- name: Democratic
- name: Progressive/Democratic
roles:
- district: Orange-1
jurisdiction: ocd-jurisdiction/country:us/state:vt/government
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Daniel J.
family_name: Hall
party:
- name: Democratic
end_date: "2014-11-05"
- name: Republican
roles:
- district: '9'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ given_name: Evan H.
family_name: Jenkins
party:
- name: Democratic
end_date: "2013-07-01"
- name: Republican
roles:
- district: '5'
Expand Down
5 changes: 1 addition & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ services:
people:
build: .
environment:
- PGDATABASE=openstatesorg
- PGHOST=db
- PGPASSWORD=openstates
- PGUSER=openstates
- DATABASE_URL=postgres://openstates:openstates@db/openstatesorg
- PYTHONPATH=scripts
volumes:
- .:/opt/people
Expand Down

0 comments on commit 3b29ee1

Please sign in to comment.