chore: Flatten out PKG_PATH data

datasciencecampus · Jul 3, 2024 · 9670407 · 9670407
1 parent d3695f5
commit 9670407
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 213 deletions.
diff --git a/src/assess_gtfs/data/gtfs/report/html_templates/evaluation_template.html b/src/assess_gtfs/data/gtfs/report/html_templates/evaluation_template.html
diff --git a/src/assess_gtfs/data/gtfs/report/html_templates/stops_template.html b/src/assess_gtfs/data/gtfs/report/html_templates/stops_template.html
diff --git a/src/assess_gtfs/data/gtfs/report/html_templates/summary_template.html b/src/assess_gtfs/data/gtfs/report/html_templates/summary_template.html
diff --git a/src/assess_gtfs/data/gtfs/report/.gitkeep → src/assess_gtfs/data/report/.gitkeep b/src/assess_gtfs/data/gtfs/report/.gitkeep → src/assess_gtfs/data/report/.gitkeep
diff --git a/...fs/data/gtfs/report/css_styles/styles.css → ...ss_gtfs/data/report/css_styles/styles.css b/...fs/data/gtfs/report/css_styles/styles.css → ...ss_gtfs/data/report/css_styles/styles.css
diff --git a/src/assess_gtfs/data/gtfs/route_lookup.pkl → src/assess_gtfs/data/route_lookup.pkl b/src/assess_gtfs/data/gtfs/route_lookup.pkl → src/assess_gtfs/data/route_lookup.pkl
diff --git a/src/assess_gtfs/gtfs_utils.py b/src/assess_gtfs/gtfs_utils.py
@@ -147,7 +147,7 @@ def filter_gtfs(
 
 def bbox_filter_gtfs(
     in_pth: Union[pathlib.Path, str] = (
-        os.path.join(PKG_PATH, "data", "gtfs", "newport-20230613_gtfs.zip"),
+        os.path.join(PKG_PATH, "data", "newport-20230613_gtfs.zip"),
     ),
     out_pth: Union[pathlib.Path, str] = pathlib.Path(
         here("data/external/filtered_gtfs.zip")
@@ -173,7 +173,7 @@ def bbox_filter_gtfs(
     ----------
     in_pth : Union[pathlib.Path, str], optional
         Path to the unfiltered GTFS feed. Defaults to
-        os.path.join(PKG_PATH, "data", "gtfs", "newport-20230613_gtfs.zip").
+        os.path.join(PKG_PATH, "data", "newport-20230613_gtfs.zip").
     out_pth : Union[pathlib.Path, str], optional
         Path to write the filtered feed to. Defaults to
         here("data/external/filtered_gtfs.zip").

diff --git a/src/assess_gtfs/report/report_utils.py b/src/assess_gtfs/report/report_utils.py
@@ -157,7 +157,7 @@ def _set_up_report_dir(
     except FileExistsError:
         pass
     styles_loc = os.path.join(
-        PKG_PATH, "data", "gtfs", "report", "css_styles", "styles.css"
+        PKG_PATH, "data", "report", "css_styles", "styles.css"
     )
     shutil.copy(
         src=styles_loc,

diff --git a/src/assess_gtfs/routes.py b/src/assess_gtfs/routes.py
@@ -156,7 +156,7 @@ def scrape_route_type_lookup(
 
 def get_saved_route_type_lookup(
     path: Union[str, pathlib.Path] = pathlib.Path(
-        os.path.join(PKG_PATH, "data", "gtfs", "route_lookup.pkl")
+        os.path.join(PKG_PATH, "data", "route_lookup.pkl")
     )
 ) -> pd.DataFrame:
     """Get the locally saved route type lookup as a dataframe.
@@ -165,7 +165,7 @@ def get_saved_route_type_lookup(
     ----------
     path : Union[str, pathlib.Path], optional
         The path to the route type lookup,
-        defaults to os.path.join(PKG_PATH, "data", "gtfs", "route_lookup.pkl")
+        defaults to os.path.join(PKG_PATH, "data", "route_lookup.pkl")
 
     Returns
     -------

diff --git a/src/assess_gtfs/validation.py b/src/assess_gtfs/validation.py
@@ -1459,7 +1459,6 @@ def html_report(
                 os.path.join(
                     PKG_PATH,
                     "data",
-                    "gtfs",
                     "report",
                     "html_templates",
                     "evaluation_template.html",
@@ -1555,7 +1554,6 @@ def html_report(
                 os.path.join(
                     PKG_PATH,
                     "data",
-                    "gtfs",
                     "report",
                     "html_templates",
                     "stops_template.html",
@@ -1601,7 +1599,6 @@ def html_report(
                 os.path.join(
                     PKG_PATH,
                     "data",
-                    "gtfs",
                     "report",
                     "html_templates",
                     "summary_template.html",