Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into fix/FRGOV-pipeline-no…
Browse files Browse the repository at this point in the history
…t-working

# Conflicts:
#	alembic/env.py
#	charging_stations_pipelines/pipelines/fr/france.py
#	charging_stations_pipelines/pipelines/fr/france_mapper.py
  • Loading branch information
mjmader committed Jan 26, 2024
2 parents 8c88b5b + 6372095 commit 51b0c2d
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions alembic/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@

from alembic import context
from sqlalchemy import engine_from_config, pool
from charging_stations_pipelines import models, settings
from charging_stations_pipelines.models import address, charging, station


current_path = os.path.abspath(".")
sys.path.append(current_path)

from charging_stations_pipelines import settings # noqa: E402
from charging_stations_pipelines.models import address, charging, station # noqa: E402

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
Expand All @@ -22,7 +20,7 @@

# add your model's MetaData object here
# for 'autogenerate' support

from charging_stations_pipelines import models # noqa: E402

target_metadata = models.Base.metadata

Expand Down

0 comments on commit 51b0c2d

Please sign in to comment.