From deb4668f2b22b1a1673a4cb89fd691ce7a0c4013 Mon Sep 17 00:00:00 2001 From: Francia Csaba Date: Mon, 11 Dec 2023 15:17:55 +0100 Subject: [PATCH] Moved gtfs_export and gtfs_generator to enhancer/services --- amarillo/app/services/__init__.py | 0 amarillo/plugins/enhancer/__init__.py | 1 + amarillo/plugins/enhancer/configuration.py | 2 +- amarillo/{app => plugins/enhancer/services}/__init__.py | 0 amarillo/{app => plugins/enhancer}/services/gtfs_export.py | 0 amarillo/{app => plugins/enhancer}/services/gtfs_generator.py | 2 +- 6 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 amarillo/app/services/__init__.py create mode 100644 amarillo/plugins/enhancer/__init__.py rename amarillo/{app => plugins/enhancer/services}/__init__.py (100%) rename amarillo/{app => plugins/enhancer}/services/gtfs_export.py (100%) rename amarillo/{app => plugins/enhancer}/services/gtfs_generator.py (94%) diff --git a/amarillo/app/services/__init__.py b/amarillo/app/services/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/amarillo/plugins/enhancer/__init__.py b/amarillo/plugins/enhancer/__init__.py new file mode 100644 index 0000000..c8e9291 --- /dev/null +++ b/amarillo/plugins/enhancer/__init__.py @@ -0,0 +1 @@ +from .enhancer import * \ No newline at end of file diff --git a/amarillo/plugins/enhancer/configuration.py b/amarillo/plugins/enhancer/configuration.py index 6e6760a..0e19314 100644 --- a/amarillo/plugins/enhancer/configuration.py +++ b/amarillo/plugins/enhancer/configuration.py @@ -8,7 +8,7 @@ from amarillo.app.models.Carpool import Carpool from amarillo.app.services import stops from amarillo.app.services import trips from amarillo.app.services.carpools import CarpoolService -from amarillo.app.services import gtfs_generator +from amarillo.plugins.enhancer.services import gtfs_generator from amarillo.app.configuration import configure_services diff --git a/amarillo/app/__init__.py b/amarillo/plugins/enhancer/services/__init__.py similarity index 100% rename from amarillo/app/__init__.py rename to amarillo/plugins/enhancer/services/__init__.py diff --git a/amarillo/app/services/gtfs_export.py b/amarillo/plugins/enhancer/services/gtfs_export.py similarity index 100% rename from amarillo/app/services/gtfs_export.py rename to amarillo/plugins/enhancer/services/gtfs_export.py diff --git a/amarillo/app/services/gtfs_generator.py b/amarillo/plugins/enhancer/services/gtfs_generator.py similarity index 94% rename from amarillo/app/services/gtfs_generator.py rename to amarillo/plugins/enhancer/services/gtfs_generator.py index 1459aca..604faad 100644 --- a/amarillo/app/services/gtfs_generator.py +++ b/amarillo/plugins/enhancer/services/gtfs_generator.py @@ -1,5 +1,5 @@ from amarillo.app.models.Carpool import Region -from amarillo.app.services.gtfs_export import GtfsExport, GtfsFeedInfo, GtfsAgency +from amarillo.plugins.enhancer.services.gtfs_export import GtfsExport, GtfsFeedInfo, GtfsAgency from amarillo.app.services.gtfs import GtfsRtProducer from amarillo.app.utils.container import container from glob import glob