Skip to content

Commit 00a76ef

Browse files
jpn--jpn--
authored
update uv lock file (#986)
* update uv lock file * strip github-action group, only use dev * update coveralls * update uv lock to larch 6.0.42 * begin to remove placeholder_sandag example
1 parent 5e528fc commit 00a76ef

File tree

8 files changed

+2732
-2299
lines changed

8 files changed

+2732
-2299
lines changed

‎.github/workflows/core_tests.yml‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: Install activitysim
4141
run: |
42-
uv sync --locked --group github-action --no-dev
42+
uv sync --locked
4343
4444
- name: Lint with Black
4545
run: |
@@ -105,7 +105,7 @@ jobs:
105105

106106
- name: Install activitysim
107107
run: |
108-
uv sync --locked --group github-action --no-dev
108+
uv sync --locked
109109
110110
- name: Lint with Black
111111
run: |
@@ -143,7 +143,6 @@ jobs:
143143
- placeholder_psrc
144144
- prototype_marin
145145
- prototype_mtc_extended
146-
- placeholder_sandag
147146
- prototype_sandag_xborder
148147
- production_semcog
149148
- prototype_mwcog
@@ -171,7 +170,7 @@ jobs:
171170

172171
- name: Install activitysim
173172
run: |
174-
uv sync --locked --group github-action --no-dev
173+
uv sync --locked
175174
176175
# TODO: Cache sharrow compiled flows? The contents of __pycache__ appear to
177176
# be ignored, so this is not working as expected right now
@@ -240,7 +239,7 @@ jobs:
240239

241240
- name: Install activitysim
242241
run: |
243-
uv sync --locked --group github-action --no-dev
242+
uv sync --locked
244243
245244
- name: Checkout Example
246245
uses: actions/checkout@v4
@@ -252,7 +251,7 @@ jobs:
252251
- name: Test ${{ matrix.region }}
253252
run: |
254253
cd ${{ matrix.region-repo }}
255-
uv run --project .. --locked --group github-action --no-dev pytest ./test
254+
uv run --project .. --locked pytest ./test
256255
257256
random_seed_generation:
258257
needs: foundation
@@ -282,7 +281,7 @@ jobs:
282281

283282
- name: Install activitysim
284283
run: |
285-
uv sync --locked --group github-action --no-dev
284+
uv sync --locked
286285
287286
- name: Test Random Seed Generation
288287
run: |
@@ -315,7 +314,7 @@ jobs:
315314

316315
- name: Install activitysim
317316
run: |
318-
uv sync --locked --group github-action --no-dev
317+
uv sync --locked
319318
320319
- name: Test Estimation Mode
321320
run: |
@@ -351,16 +350,16 @@ jobs:
351350

352351
- name: Install activitysim
353352
run: |
354-
uv sync --locked --group github-action
353+
uv sync --locked
355354
356355
- name: Create Estimation Data
357356
run: >
358-
uv run --group github-action python activitysim/examples/example_estimation/notebooks/est_mode_setup.py
357+
uv run python activitysim/examples/example_estimation/notebooks/est_mode_setup.py
359358
--household_sample_size 5000
360359
361360
- name: Test Estimation Notebooks
362361
run: >
363-
uv run --group github-action pytest activitysim/examples/example_estimation/notebooks
362+
uv run pytest activitysim/examples/example_estimation/notebooks
364363
--nbmake-timeout=3000
365364
--ignore=activitysim/examples/example_estimation/notebooks/01_estimation_mode.ipynb
366365
--ignore-glob=activitysim/examples/example_estimation/notebooks/test-estimation-data/**
@@ -392,7 +391,7 @@ jobs:
392391

393392
- name: Install activitysim
394393
run: |
395-
uv sync --locked --only-group github-action
394+
uv sync --locked
396395
397396
- name: Test Estimation EDB Creation
398397
run: |
@@ -425,7 +424,7 @@ jobs:
425424

426425
- name: Install activitysim
427426
run: |
428-
uv sync --locked --group github-action --no-dev
427+
uv sync --locked
429428
430429
- name: Test Expression Profiling
431430
run: |
@@ -457,7 +456,7 @@ jobs:
457456
python-version-file: ".python-version"
458457
- name: Install activitysim
459458
run: |
460-
uv sync --locked --group github-action --no-dev
459+
uv sync --locked
461460
- name: localize version switcher
462461
run: |
463462
python .github/workflows/localize-base-urls.py docs/_static/switcher.json

‎activitysim/examples/example_manifest.yaml‎

Lines changed: 0 additions & 214 deletions
Original file line numberDiff line numberDiff line change
@@ -619,220 +619,6 @@
619619
data/land_use.csv
620620
36383b4c9dacdd7dd10c84b4479aa9f53ced23e155b6d354c468decc6710c80e
621621

622-
- name: placeholder_sandag_1_zone
623-
description: 90-TAZ (includes univ) 1-zone test example for the SANDAG region
624-
# activitysim create -e placeholder_sandag_1_zone -d test_placeholder_sandag_1_zone
625-
# cd test_placeholder_sandag_1_zone
626-
# activitysim run -c configs_1_zone -c prototype_mtc/configs -d data_1 -o output_1 -s settings_mp.yaml
627-
# cd ..
628-
include:
629-
- placeholder_sandag/../prototype_mtc/configs
630-
prototype_mtc
631-
- placeholder_sandag/configs_1_zone
632-
- placeholder_sandag/data_1
633-
- placeholder_sandag/output_1
634-
635-
- name: placeholder_sandag_1_zone_full
636-
description: full 1-zone example for the SANDAG region
637-
# activitysim create -e placeholder_sandag_1_zone_full -d test_placeholder_sandag_1_zone_full
638-
# cd test_placeholder_sandag_1_zone_full
639-
# activitysim run -c configs_1_zone -c prototype_mtc/configs -d data_1 -o output_1 -s settings_mp.yaml
640-
# cd ..
641-
include:
642-
- placeholder_sandag/../prototype_mtc/configs
643-
prototype_mtc
644-
- placeholder_sandag/configs_1_zone
645-
# placeholder_sandag/data_1 # load data from activitysim_resources instead
646-
- placeholder_sandag/output_1
647-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/households.csv
648-
data_1/households.csv
649-
2b0b19a1a0b00901e80a533fc6418a4dbeb3d0b017d9feadae71324f9145dcec
650-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/persons.csv
651-
data_1/persons.csv
652-
7864364ef70ab3f490570768da12984593da81921a0cd3f8e4b0d724ae436f7a
653-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/land_use.csv
654-
data_1/land_use.csv
655-
2088fd1375a6a5ee253cc11da5f1b9171a9e0b788896589197ecd41ded35edd0
656-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims1.omx
657-
data_1/skims1.omx
658-
33cd691c51b205e0c2bd09dba5612cd05862127f3c8ffc83c4fd533e83a0817b
659-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims2.omx
660-
data_1/skims2.omx
661-
e650d70aeb932a1452f636088af599abe6e66dd0843a045130d8e683601b5a82
662-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims3.omx
663-
data_1/skims3.omx
664-
9940974c5cde572ad88e1e1d3db7ba7e7954084599f65aac1ebe575233cde68d
665-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims4.omx
666-
data_1/skims4.omx
667-
586cb610b15d698e5ebbb6ba02847c405b5ed6b65c24a01cd812684cf665631c
668-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims5.omx
669-
data_1/skims5.omx
670-
c3584e8c413d63ee38847ece0cc665c969a2152480bd4ca71dfbe9e91b59b2bd
671-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_1_zone_data_full/skims6.omx
672-
data_1/skims6.omx
673-
e3f7fb1e0b334fc83dc69985dce8b925e3660149c5de5635c7d8464e306074b9
674-
675-
- name: placeholder_sandag_2_zone
676-
description: 90-TAZ 609-MAZ (includes univ) 2-zone test example for the SANDAG region
677-
# activitysim create -e placeholder_sandag_2_zone -d test_placeholder_sandag_2_zone
678-
# cd test_placeholder_sandag_2_zone
679-
# activitysim run -c configs_2_zone -c placeholder_psrc/configs -d data_2 -o output_2 -s settings_mp.yaml
680-
# cd ..
681-
include:
682-
- placeholder_sandag/../placeholder_psrc/configs
683-
placeholder_psrc
684-
- placeholder_sandag/configs_2_zone
685-
- placeholder_sandag/data_2
686-
- placeholder_sandag/data_3/maz_to_maz_bike.csv
687-
data_2/maz_to_maz_bike.csv
688-
# the original data for data_2 was corrupted, but there's no need to store this file twice in the repo
689-
- placeholder_sandag/output_2
690-
691-
- name: placeholder_sandag_2_zone_full
692-
description: full 2-zone example for the SANDAG region
693-
# activitysim create -e placeholder_sandag_2_zone_full -d test_placeholder_sandag_2_zone_full
694-
# cd test_placeholder_sandag_2_zone_full
695-
# activitysim run -c configs_2_zone -c placeholder_psrc/configs -d data_2 -o output_2 -s settings_mp.yaml
696-
# cd ..
697-
include:
698-
- placeholder_sandag/../placeholder_psrc/configs
699-
placeholder_psrc
700-
- placeholder_sandag/configs_2_zone
701-
# placeholder_sandag/data_2 # load data from activitysim_resources instead
702-
- placeholder_sandag/output_2
703-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/households.csv
704-
data_2/households.csv
705-
4afe40dfbdb89f17cd150fd5b32245364d538cdebb91fd323e18c6f570d1a087
706-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/land_use.csv
707-
data_2/land_use.csv
708-
e914b54b16000af84d2e49e27697898028a7c007a5792812c7274ce33e1dc064
709-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/maz.csv
710-
data_2/maz.csv
711-
d9d908adcbe1e56fbb6d50665e767c317cdfbeedeae675dda449206f2a7fb3f1
712-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/maz_to_maz_bike.csv
713-
data_2/maz_to_maz_bike.csv
714-
c68322fff0ff32a7d487b7cd8dd1e205192d2728621c9cc541e8c41722293cbc
715-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/maz_to_maz_walk.csv
716-
data_2/maz_to_maz_walk.csv
717-
76c702d8ded8ae9eb7ae978ffa35c1e74ae6264dd2f90d96cdaa42d49c54684a
718-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/persons.csv
719-
data_2/persons.csv
720-
7864364ef70ab3f490570768da12984593da81921a0cd3f8e4b0d724ae436f7a
721-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/taz.csv
722-
data_2/taz.csv
723-
ac9fa2f5adc13e90b1fa5537444f25b9ea389bdfe56e7e9f1ef3be9eb63014ef
724-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims1.omx
725-
data_2/skims1.omx
726-
4ad4aa7669c095a0dfe94c48bc00f57ff7b07c623f4322d75d4ef5c69bcfabcd
727-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims2.omx
728-
data_2/skims2.omx
729-
fad6033a5ddbd2efbd3ca20b5b6bb98408ad57708d91cf129fabf8d4ec8d8063
730-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims3.omx
731-
data_2/skims3.omx
732-
c7691c95436a6599e7c5cb497eecd4b86a669a3078785ec37f40247f15016e9c
733-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims4.omx
734-
data_2/skims4.omx
735-
61f907862c4cff5617c9fe36c0b68885277821b1a1cfa1b9290f30542f04cbbe
736-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims5.omx
737-
data_2/skims5.omx
738-
04f5b2bad494b39eadb3a59e040aa1603edaa7cdc12ba1f457eacc69b0f89f60
739-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_2_zone_data_full/skims6.omx
740-
data_2/skims6.omx
741-
77a82afa09ee1f4c48aa7928e96756525d170402ca99da04cdf676e45cb6fbcf
742-
743-
- name: placeholder_sandag_3_zone
744-
description: 90-TAZ 609-MAZ (includes univ) 3-zone test example for the SANDAG region
745-
# activitysim create -e placeholder_sandag_3_zone -d test_placeholder_sandag_3_zone
746-
# cd test_placeholder_sandag_3_zone
747-
# activitysim run -c configs_3_zone -c prototype_mtc/configs -d data_3 -o output_3 -s settings_mp.yaml
748-
# cd ..
749-
include:
750-
- placeholder_sandag/data_3
751-
- placeholder_sandag/../prototype_mtc/configs
752-
prototype_mtc
753-
- placeholder_sandag/configs_3_zone
754-
- placeholder_sandag/configs_skip_accessibility
755-
- placeholder_sandag/output_3
756-
subdirs:
757-
configs_dir:
758-
- configs_3_zone
759-
- prototype_mtc/configs
760-
data_dir: data_3
761-
output_dir: output_3
762-
763-
- name: placeholder_sandag_3_zone_full
764-
description: full 3-zone example for the SANDAG region
765-
# activitysim create -e placeholder_sandag_3_zone_full -d test_placeholder_sandag_3_zone_full
766-
# cd test_placeholder_sandag_3_zone_full
767-
# activitysim run -c configs_3_zone -c prototype_mtc/configs -d data_3 -o output_3 -s settings_mp.yaml
768-
# cd ..
769-
include:
770-
# placeholder_sandag/data_3 # load data from activitysim_resources instead
771-
- placeholder_sandag/../prototype_mtc/configs
772-
prototype_mtc
773-
- placeholder_sandag/configs_3_zone
774-
- placeholder_sandag/configs_skip_accessibility
775-
- placeholder_sandag/output_3
776-
- placeholder_sandag/data_3/cached_accessibility.csv.gz
777-
data_3/cached_accessibility.csv.gz
778-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz_skims1.omx
779-
data_3/taz_skims1.omx
780-
5b56d0e79ec671e37f8c71f7fedd741d7bf32d2bced866ab1f03f3973fccce8c
781-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz_skims2.omx
782-
data_3/taz_skims2.omx
783-
fbdd68ba7f8c82914b47da885326da35499293fd9097f5928b5247bbf8f70376
784-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz_skims3.omx
785-
data_3/taz_skims3.omx
786-
57e2e72e4e5ab19ecccc240df8223fc6433d315ca710dca975f81f32dc25e92d
787-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz_skims4.omx
788-
data_3/taz_skims4.omx
789-
f68cf6cf0b5c8e58a19d8ba9ea6cc39abcce0af417f635d6ccffdd28dae50779
790-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_skims1.omx
791-
data_3/tap_skims1.omx
792-
a26f38efab2f88a5923938b7572e47badac487a54d4819616bb5ccc5c19a6eb0
793-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_skims2.omx
794-
data_3/tap_skims2.omx
795-
a0aef494023763572674acbe755d665db100c1d18f664b464c514b30503824d9
796-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_skims3.omx
797-
data_3/tap_skims3.omx
798-
a33659454e215402618a352259398eed59a8e42991fd8890e267e563a0730853
799-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_skims4.omx
800-
data_3/tap_skims4.omx
801-
f905398e850ed005df5647de46f13eb976ba3c313f2f7aea1f71c369c9004c7f
802-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/households.csv
803-
data_3/households.csv
804-
e504d391c19367b86a09074bbabeb9149a419a8e07f98cd7e380f98b399c1cd8
805-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/persons.csv
806-
data_3/persons.csv
807-
7864364ef70ab3f490570768da12984593da81921a0cd3f8e4b0d724ae436f7a
808-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/land_use.csv
809-
data_3/land_use.csv
810-
d773c95d08d24962d53f54929080bacb91993c01925350b0d92a32f18b66d790
811-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz.csv
812-
data_3/maz.csv
813-
c8162a6f38541f62ed706529c062bd0c4158bbcfbc1f65d787b506a5ad218dda
814-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/taz.csv
815-
data_3/taz.csv
816-
ac9fa2f5adc13e90b1fa5537444f25b9ea389bdfe56e7e9f1ef3be9eb63014ef
817-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz_to_maz_bike.csv
818-
data_3/maz_to_maz_bike.csv
819-
39199f42334c65f1eadf2c47213ee8a10d83eb0bac4a7447a6fbd165d9065e11
820-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz_to_maz_walk.csv
821-
data_3/maz_to_maz_walk.csv
822-
8cf6cd05e95ed08a7501229ed8ec515d83fd2904d407ecc350f1867ef2a9b378
823-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz_to_tap_walk.csv
824-
data_3/maz_to_tap_walk.csv
825-
2d0e4c49f7d94f8d15ee9a5d39d9dc9c9ab10cfe6259a835284053c84cef94d5
826-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/maz_to_tap_drive.csv
827-
data_3/maz_to_tap_drive.csv
828-
bd4c4ef6a87c0c3db18615f6c2dcf6e863aac62afce48f627ffa142c9c4e9789
829-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap.csv
830-
data_3/tap.csv
831-
9b74d18d681a1c61708dd5767d90d7872443a0ef7be189f802c3905592f3c8da
832-
- https://media.githubusercontent.com/media/activitysim/activitysim_resources/master/sandag_3_zone_data_full/tap_lines.csv
833-
data_3/tap_lines.csv
834-
0e1b2c532e5e85b48e2ac77b2836be7ec0cc7cba79907c6f5fb11d2ba171230a
835-
836622
- name: prototype_sandag_xborder
837623
description: SANDAG cross border travel model
838624
# activitysim create -e prototype_sandag_xborder -d test_prototype_sandag_xborder

0 commit comments

Comments
 (0)