Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Legislative district digest #1253

Merged
merged 8 commits into from
Oct 10, 2024
Merged

Legislative district digest #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ae10cb1
add legislative districts to shared data, create crosswalk for operat…
Oct 9, 2024
3ff11a4
move district functions into _report_utils
Oct 10, 2024
f786622
(portfolio_utils): add yaml creation function, remove table styling f…
Oct 10, 2024
688e635
update district report to use functions
Oct 10, 2024
b8315e5
legislative districts GTFS digest
Oct 10, 2024
457241e
add legislative report notebook
Oct 10, 2024
ac7d5b1
break out git adds in Makefile
Oct 10, 2024
95a35cf
add sample ymls
Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
# To specify different Makefile: make build_parallel_corridors -f Makefile

build_portfolio_site:
#cd portfolio/ && pip install -r requirements.txt && cd ../
cd portfolio/ && pip install -r requirements.txt && cd ../
#need git rm because otherwise, just local removal, but git change is untracked
git rm portfolio/$(site)/ -rf
python portfolio/portfolio.py clean $(site)
#git rm portfolio/$(site)/ -rf
#python portfolio/portfolio.py clean $(site)
python portfolio/portfolio.py build $(site) --deploy
make git_check
git add portfolio/$(site)/*.yml portfolio/$(site)/*.md
git add portfolio/sites/$(site).yml
#make production_portfolio

git_check:
git add portfolio/$(site)/*.yml portfolio/$(site)/*.md
git_check_sections:
git add portfolio/$(site)/*.ipynb # this one is most common, where operators nested under district
#git add portfolio/$(site)/district_*/*.ipynb # this one less common, but it's district pages only
git add portfolio/sites/$(site).yml

git_check_no_sections:
git add portfolio/$(site)/district_*/*.ipynb # this one less common, but it's district pages only

build_competitive_corridors:
$(eval export site = competitive_corridors)
Expand Down Expand Up @@ -46,6 +47,8 @@ build_gtfs_digest:
#cd gtfs_digest/ && python deploy_portfolio_yaml.py && make assemble_data && cd ..
cd gtfs_digest/ && python deploy_portfolio_yaml.py
make build_portfolio_site
make git_check_sections


build_gtfs_digest_testing:
$(eval export site = gtfs_digest_testing)
Expand All @@ -57,7 +60,14 @@ build_district_digest:
$(eval export site = district_digest)
#cd data-analyses/rt_segment_speeds && pip install -r requirements.txt && cd ../_shared_utils && make setup_env && cd ..
make build_portfolio_site
git add portfolio/$(site)/district_*/*.ipynb
make git_check_no_sections

build_legislative_district_digest:
$(eval export site = legislative_district_digest)
#cd data-analyses/rt_segment_speeds && pip install -r requirements.txt && cd ../_shared_utils && make setup_env && cd ..
make build_portfolio_site
make git_check_no_sections


add_precommit:
pip install pre-commit
Expand Down
2 changes: 1 addition & 1 deletion _shared_utils/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
setup(
name="shared_utils",
packages=find_packages(),
version="2.7",
version="2.8",
description="Shared utility functions for data analyses",
author="Cal-ITP",
license="Apache",
Expand Down
Loading
Loading