ynerant/nupes-elections
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ynerant:24f1dafd990fa49536b438ed48d0e9ebe9918807
Branches Tags
ynerant:main
..
compare: ynerant:3c0b03c5766d51c5de52273daae67a9fe21ea9b2
Branches Tags
ynerant:main

No commits in common. "24f1dafd990fa49536b438ed48d0e9ebe9918807" and "3c0b03c5766d51c5de52273daae67a9fe21ea9b2" have entirely different histories.
24f1dafd99 ... 3c0b03c576

3 changed files with 8 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
alembic/versions/42ff9c981be7_ajout_des_modèles_de_résultats_pour_les_.py
View File

@ -104,7 +104,7 @@ def upgrade() -> None:
) )
op.create_table('circonscription', op.create_table('circonscription',
sa.Column('id', sa.String(length=6), nullable=False), sa.Column('id', sa.String(length=6), nullable=False),
sa.Column('departement_code', sa.String(length=3), nullable=False), sa.Column('departement_code', sa.String(length=2), nullable=False),
sa.Column('numero', sa.Integer(), nullable=False), sa.Column('numero', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['departement_code'], ['departement.code_insee'], ), sa.ForeignKeyConstraint(['departement_code'], ['departement.code_insee'], ),
sa.PrimaryKeyConstraint('id') sa.PrimaryKeyConstraint('id')
@ -119,7 +119,7 @@ def upgrade() -> None:
) )
op.create_table('resultats2024_departement', op.create_table('resultats2024_departement',
sa.Column('id', sa.Integer(), nullable=False), sa.Column('id', sa.Integer(), nullable=False),
sa.Column('dpt_id', sa.String(length=3), nullable=False), sa.Column('dpt_id', sa.String(length=2), nullable=False),
sa.Column('resultats_region_id', sa.Integer(), nullable=False), sa.Column('resultats_region_id', sa.Integer(), nullable=False),
sa.Column('inscrits', sa.Integer(), nullable=False), sa.Column('inscrits', sa.Integer(), nullable=False),
sa.Column('votants', sa.Integer(), nullable=False), sa.Column('votants', sa.Integer(), nullable=False),

6
nupes/scripts/export_resultats_2024.py
View File

@ -201,7 +201,8 @@ def exporter_resultats_departements(engine: Engine) -> None:
def exporter_resultats_communes(engine: Engine) -> None: def exporter_resultats_communes(engine: Engine) -> None:
with Session(engine) as session: with Session(engine) as session:
communes = session.execute(select(Commune)).scalars().all() # FIXME On n'importe que les communes du Bas-Rhin pour des raisons de gain de temps
communes = session.execute(select(Commune).filter_by(departement_code="67")).scalars().all()
communes_json = [] communes_json = []
for commune in tqdm(communes, desc="Communes"): for commune in tqdm(communes, desc="Communes"):
@ -257,5 +258,4 @@ def run(engine: Engine) -> None:
exporter_resultats_france(engine) exporter_resultats_france(engine)
exporter_resultats_regions(engine) exporter_resultats_regions(engine)
exporter_resultats_departements(engine) exporter_resultats_departements(engine)
# FIXME Les communes prennent trop de temps exporter_resultats_communes(engine)
# exporter_resultats_communes(engine)

6
nupes/scripts/import_resultats_web_2024.py
View File

@ -170,7 +170,8 @@ def importer_resultats_departements(engine: Engine) -> None:
def importer_resultats_communes(engine: Engine) -> None: def importer_resultats_communes(engine: Engine) -> None:
with Session(engine) as session: with Session(engine) as session:
for commune in tqdm(session.execute(select(Commune)).scalars().all(), desc="Communes"): # FIXME On n'importe que les communes du Bas-Rhin pour des raisons de gain de temps
for commune in tqdm(session.execute(select(Commune).filter_by(departement_code="67")).scalars().all(), desc="Communes"):
reg_code = commune.departement.region_code reg_code = commune.departement.region_code
reg_path = f"{reg_code}/" reg_path = f"{reg_code}/"
dpt_code = commune.departement_code dpt_code = commune.departement_code
@ -294,5 +295,4 @@ def run(engine: Engine) -> None:
importer_resultats_france(engine) importer_resultats_france(engine)
importer_resultats_regions(engine) importer_resultats_regions(engine)
importer_resultats_departements(engine) importer_resultats_departements(engine)
# FIXME Les communes prennent trop de temps importer_resultats_communes(engine)
# importer_resultats_communes(engine)