Skip to content

Commit e381cfa

Browse files
authored
Merge pull request #1537 from cal-itp/clean_directory
clean NTD directory
2 parents 60b3313 + 0122e71 commit e381cfa

File tree

69 files changed

+115
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+115
-110
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ remove_competitive_corridors:
3030
build_ntd_report:
3131
$(eval export site = ntd_monthly_ridership)
3232
cd bus_service_increase/ && make setup_bus_service_utils && cd ..
33-
cd ntd/ && python deploy_portfolio_yaml.py && cd ..
33+
cd ntd/monthly_ridership_report/ && python deploy_portfolio_yaml.py && cd ..
3434
make build_portfolio_site
3535

3636
build_ntd_annual_report:

ntd/annual_ridership_report/annual_ridership_module.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import shutil
44
import sys
55
# import annual_ridership_module
6-
sys.path.append("../") # up one level
6+
sys.path.append("../../") # up one level
77

88
import pandas as pd
99
from siuba import _, collect, count, filter, select, show_query
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Make sure update_vars.py is updated
22
ntd_monthly_export:
33
python monthly_ridership_by_rtpa.py
4-
cd ../ && make build_ntd_report -f Makefile
4+
cd ../../ && make build_ntd_report -f Makefile
55

ntd/deploy_portfolio_yaml.py renamed to ntd/monthly_ridership_report/deploy_portfolio_yaml.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@
88
in the navigation panel.
99
"""
1010
import pandas as pd
11-
11+
import sys
12+
sys.path.append("../")
1213
from pathlib import Path
1314

1415
from shared_utils import portfolio_utils
1516
from update_vars import GCS_FILE_PATH
1617
from _01_ntd_ridership_utils import ntd_id_to_rtpa_crosswalk # getting rtpa_name from dim_organizations now
1718

18-
PORTFOLIO_SITE_YAML = Path("../portfolio/sites/ntd_monthly_ridership.yml")
19+
PORTFOLIO_SITE_YAML = Path("../../portfolio/sites/ntd_monthly_ridership.yml")
1920

2021
if __name__ == "__main__":
2122

ntd/explore_new_dim_monthly_ridership.ipynb renamed to ntd/monthly_ridership_report/explore_new_dim_monthly_ridership.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2991,7 +2991,7 @@
29912991
"name": "python",
29922992
"nbconvert_exporter": "python",
29932993
"pygments_lexer": "ipython3",
2994-
"version": "3.11.6"
2994+
"version": "3.11.10"
29952995
}
29962996
},
29972997
"nbformat": 4,

ntd/monthly_ridership_by_rtpa.py renamed to ntd/monthly_ridership_report/monthly_ridership_by_rtpa.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
import os
1111
import pandas as pd
1212
import shutil
13+
import sys
14+
15+
sys.path.append("../") # up one level
1316

1417
from calitp_data_analysis.tables import tbls
1518
from siuba import _, collect, count, filter, show_query #, distinct

0 commit comments

Comments
 (0)