Commit 3120736c authored by okhin's avatar okhin 🚴

Merge branch '198-lot-of-data-missing-on-initial-setup-with-update_all' into 'master'

Fixing bin/ scripts and fixing the damn issue.

Closes #198

See merge request !213
parents 6829259c db9ebfb6
Pipeline #1097 passed with stages
in 10 minutes and 33 seconds
#!/bin/bash #!/bin/bash
set -ex set -x
source bin/lib.sh source bin/lib.sh
......
#!/bin/bash #!/bin/bash
set -ex set -x
source bin/lib.sh source bin/lib.sh
......
#!/bin/bash #!/bin/bash
set -ex set -x
source bin/lib.sh source bin/lib.sh
......
#!/bin/bash #!/bin/bash
set -ex set -x
source bin/lib.sh source bin/lib.sh
......
...@@ -127,132 +127,132 @@ _get_an_delegations = DelegationHelper({}, {}, False) ...@@ -127,132 +127,132 @@ _get_an_delegations = DelegationHelper({}, {}, False)
FranceDataVariants = { FranceDataVariants = {
"AN": { "AN": {
"chamber": u"Assemblée nationale", "chamber": u"Assemblée nationale",
"abbreviation": "AN", "abbreviation": u"AN",
"chamber_url_field": "url_an", "chamber_url_field": u"url_an",
"mail_domain": "@assemblee-nationale.fr", "mail_domain": u"@assemblee-nationale.fr",
"off_city": "Paris", "off_city": u"Paris",
"off_street": u"Rue de l'Université", "off_street": u"Rue de l'Université",
"off_number": "126", "off_number": u"126",
"off_code": "75355", "off_code": u"75355",
"off_name": u"Assemblée nationale", "off_name": u"Assemblée nationale",
"mandates": [ "mandates": [
{ {
"kind": "chamber", "kind": u"chamber",
"chamber": True, "chamber": True,
"abbr": "AN", "abbr": u"AN",
"name": u"Assemblée nationale", "name": u"Assemblée nationale",
"role": u"Député", "role": u"Député",
"start": "%(mandat_debut)s", "start": u"%(mandat_debut)s",
"end": "%(mandat_fin)s" "end": u"%(mandat_fin)s"
}, },
{ {
"kind": "group", "kind": u"group",
"chamber": True, "chamber": True,
"abbr": "%(groupe_sigle)s", "abbr": u"%(groupe_sigle)s",
"name_path": "groupe/organisme", "name_path": u"groupe/organisme",
"role_path": "groupe/fonction", "role_path": u"groupe/fonction",
"start": "%(mandat_debut)s", "start": u"%(mandat_debut)s",
"end": "%(mandat_fin)s" "end": u"%(mandat_fin)s"
}, },
{ {
"kind": "department", "kind": u"department",
"abbr": "%(num_deptmt)s", "abbr": u"%(num_deptmt)s",
"name": "%(nom_circo)s", "name": u"%(nom_circo)s",
"start": "%(mandat_debut)s", "start": u"%(mandat_debut)s",
"end": "%(mandat_fin)s" "end": u"%(mandat_fin)s"
}, },
{ {
"kind": "district", "kind": u"district",
"abbr": "%(num_deptmt)s-%(num_circo)s", "abbr": u"%(num_deptmt)s-%(num_circo)s",
"name_fn": _get_rep_district_name, "name_fn": _get_rep_district_name,
"start": "%(mandat_debut)s", "start": u"%(mandat_debut)s",
"end": "%(mandat_fin)s" "end": u"%(mandat_fin)s"
}, },
{ {
"kind": "committee", "kind": u"committee",
"chamber": True, "chamber": True,
"from": _get_an_committees, "from": _get_an_committees,
"abbr": "%(abbr)s", "abbr": u"%(abbr)s",
"name": "%(name)s", "name": u"%(name)s",
"role": "%(role)s", "role": u"%(role)s",
"start": "%(start)s", "start": u"%(start)s",
"end": "%(end)s" "end": u"%(end)s"
}, },
{ {
"kind": "delegation", "kind": u"delegation",
"chamber": True, "chamber": True,
"from": _get_an_delegations, "from": _get_an_delegations,
"abbr": "%(abbr)s", "abbr": u"%(abbr)s",
"name": "%(name)s", "name": u"%(name)s",
"role": "%(role)s", "role": u"%(role)s",
"start": "%(start)s", "start": u"%(start)s",
"end": "%(end)s" "end": u"%(end)s"
} }
] ]
}, },
"SEN": { "SEN": {
"chamber": u"Sénat", "chamber": u"Sénat",
"abbreviation": "SEN", "abbreviation": u"SEN",
"chamber_url_field": "url_institution", "chamber_url_field": u"url_institution",
"mail_domain": "@senat.fr", "mail_domain": u"@senat.fr",
"off_city": "Paris", "off_city": u"Paris",
"off_street": u"Rue de Vaugirard", "off_street": u"Rue de Vaugirard",
"off_number": "15", "off_number": u"15",
"off_code": "75291", "off_code": u"75291",
"off_name": u"Palais du Luxembourg", "off_name": u"Palais du Luxembourg",
"mandates": [ "mandates": [
{ {
"kind": "chamber", "kind": u"chamber",
"chamber": True, "chamber": True,
"abbr": "SEN", "abbr": u"SEN",
"name": u"Sénat", "name": u"Sénat",
"role": u"Sénateur", "role": u"Sénateur",
"start": "%(mandat_debut)s", "start": u"%(mandat_debut)s",
"end": "%(mandat_fin)s" "end": u"%(mandat_fin)s"
}, },
{ {
"kind": "group", "kind": u"group",
"chamber": True, "chamber": True,
"abbr": "%(groupe_sigle)s", "abbr": u"%(groupe_sigle)s",
"name_path": "groupe/organisme", "name_path": u"groupe/organisme",
"role_path": "groupe/fonction", "role_path": u"groupe/fonction",
"start": "%(mandat_debut)s", "start": u"%(mandat_debut)s",
"end": "%(mandat_fin)s" "end": u"%(mandat_fin)s"
}, },
{ {
"kind": "department", "kind": u"department",
"abbr": "%(num_deptmt)s", "abbr": u"%(num_deptmt)s",
"name": "%(nom_circo)s", "name": u"%(nom_circo)s",
"start": "%(mandat_debut)s", "start": u"%(mandat_debut)s",
"end": "%(mandat_fin)s" "end": u"%(mandat_fin)s"
}, },
{ {
"kind": "district", "kind": u"district",
"abbr": "%(num_deptmt)s-%(num_circo)s", "abbr": u"%(num_deptmt)s-%(num_circo)s",
"name_fn": _get_rep_district_name, "name_fn": _get_rep_district_name,
"start": "%(mandat_debut)s", "start": u"%(mandat_debut)s",
"end": "%(mandat_fin)s" "end": u"%(mandat_fin)s"
}, },
{ {
"kind": "committee", "kind": u"committee",
"chamber": True, "chamber": True,
"from": _get_sen_committees, "from": _get_sen_committees,
"abbr": "%(abbr)s", "abbr": u"%(abbr)s",
"name": "%(name)s", "name": u"%(name)s",
"role": "%(role)s", "role": u"%(role)s",
"start": "%(start)s", "start": u"%(start)s",
"end": "%(end)s" "end": u"%(end)s"
}, },
{ {
"kind": "delegation", "kind": u"delegation",
"chamber": True, "chamber": True,
"from": _get_sen_delegations, "from": _get_sen_delegations,
"abbr": "%(abbr)s", "abbr": u"%(abbr)s",
"name": "%(name)s", "name": u"%(name)s",
"role": "%(role)s", "role": u"%(role)s",
"start": "%(start)s", "start": u"%(start)s",
"end": "%(end)s" "end": u"%(end)s"
} }
] ]
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment