Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2556 commits
Select commit Hold shift + click to select a range
0fa85e2
add missing import
jpn-- Jan 29, 2024
25644f9
docstrings
jpn-- Jan 29, 2024
a5ee11b
bugfix
jpn-- Jan 29, 2024
cce057c
pass cache dir to mp
jpn-- Jan 30, 2024
9a62c62
catch stringized annotations
jpn-- Jan 30, 2024
cf4ef76
not this value
jpn-- Jan 30, 2024
08f3be8
remove code in comments
i-am-sijia Jan 31, 2024
fe6bd6e
Input Checker (#753)
dhensle Jan 31, 2024
e161158
Merge commit 'a8e755f96d0e32633a6d3657c4878e3b6a37e59a' into develop
jpn-- Jan 31, 2024
cfe034a
add check column type in the tests in util/test
i-am-sijia Jan 31, 2024
83d9e67
remove unwanted tracing
i-am-sijia Jan 31, 2024
3c60efc
blacken
i-am-sijia Jan 31, 2024
3d66176
Merge pull request #788 from jpn--/develop-merge
jpn-- Jan 31, 2024
a9dd383
move comment
i-am-sijia Feb 1, 2024
b24874a
Merge branch 'develop' into cfg-documentation-vy
jpn-- Feb 1, 2024
1ee004c
Merge branch 'cfg-documentation-vy' into explicit-chunk-with-config
jpn-- Feb 1, 2024
25e4f6c
Merge pull request #758 from camsys/cfg-documentation-vy
jpn-- Feb 1, 2024
4b20ada
Merge commit '25e4f6c9055cccaeee2145b2924bdc7d00459abc' into explicit…
jpn-- Feb 1, 2024
ccc195c
relax progressive checks for categorical dtypes
jpn-- Feb 2, 2024
f81211a
update pointers
jpn-- Feb 2, 2024
e917d63
test explicit chunking
jpn-- Feb 2, 2024
f0a55c1
test agg accessibility where it will run
jpn-- Feb 2, 2024
3c047e0
drop unrelated changes
jpn-- Feb 2, 2024
54afbb0
use empty string as NaN
jpn-- Feb 6, 2024
f09ac76
Merge commit '25e4f6c9055cccaeee2145b2924bdc7d00459abc' into data-typ…
jpn-- Feb 6, 2024
ae126f1
Merge pull request #8 from camsys/data-type-op-pd-cat
i-am-sijia Feb 6, 2024
277bbb8
update mtc_ext progressive test for categorical outputs
jpn-- Feb 6, 2024
74d4f96
Merge commit 'ae126f1f85b7ac858f921a762e49e9da534a9efb' into data-typ…
jpn-- Feb 6, 2024
69465d9
Merge pull request #759 from camsys/explicit-chunk-with-config
jpn-- Feb 6, 2024
9cd9bbe
Merge commit '69465d9534e2ca889ad5a5acaed1eadc9a330a6f' into data-typ…
jpn-- Feb 6, 2024
d18ceef
simplify code
jpn-- Feb 6, 2024
4d111f2
Merge pull request #653 from psrc/develop
jpn-- Feb 6, 2024
e62f28b
Merge branch 'develop' of https://github.com/ActivitySim/activitysim …
bwentl Feb 6, 2024
688539e
format with black
bwentl Feb 6, 2024
42d4e8c
Merge pull request #9 from camsys/data-type-dev-merge
i-am-sijia Feb 6, 2024
63a0b85
Merge pull request #763 from stefancoe/outputs_parquet
jpn-- Feb 6, 2024
dcdbb56
rollback mistaken merge
jpn-- Feb 6, 2024
fc06d62
Merge pull request #793 from camsys/oops
jpn-- Feb 6, 2024
a3cb622
Merge pull request #10 from wsp-sag/develop
i-am-sijia Feb 7, 2024
17a85ec
Merge branch 'develop' into location_estimation_patch
jpn-- Feb 7, 2024
7c044fd
merge 'develop'
jpn-- Feb 7, 2024
b418004
warnings on tot_tours
jpn-- Feb 7, 2024
3d4dc35
add back dropped imports
jpn-- Feb 7, 2024
62c3523
Merge pull request #661 from JoeJimFlood/tot_tours
jpn-- Feb 8, 2024
6a20954
Merge pull request #687 from TransLinkForecasting/location_estimation…
jpn-- Feb 8, 2024
ef0f0a5
update envs for Pydantic 2
jpn-- Feb 8, 2024
2a12e89
need nbmake
jpn-- Feb 8, 2024
2938fec
model_validate not parse_obj
jpn-- Feb 8, 2024
613126e
update test to use pydantic 2
jpn-- Feb 8, 2024
2a72c2f
remove outdated commented code
jpn-- Feb 8, 2024
5141945
Merge pull request #796 from camsys/pydantic-2
jpn-- Feb 8, 2024
0d69abb
added stricter joining of annotated fields
nick-fournier Apr 26, 2023
6b3a90c
lint blacked
nick-fournier Apr 26, 2023
a3f60a4
added unit test for df_from_dict indexing
dhensle Feb 8, 2024
5f18242
remove filtered alts from alts_long as well
dhensle Feb 2, 2024
cbc3dc8
logging and correct order for vehicle type name
dhensle Feb 3, 2024
70c7366
correct veh type alts indexing
dhensle Feb 6, 2024
ede2a52
veh type alts CI test
dhensle Feb 8, 2024
3521c8d
blacken
dhensle Feb 8, 2024
bdc9cac
Merge pull request #672 from nick-fournier-rsg/annotate_bugfix
jpn-- Feb 9, 2024
a2ad2a1
Merge pull request #790 from ActivitySim/veh_type_alts_filter_fix
jpn-- Feb 9, 2024
1f40c06
Merge branch 'develop' into data-type-op-pd-cat
jpn-- Feb 9, 2024
8bdfa0f
Merge branch 'data-type-op-pd-cat' into perf-fix
jpn-- Feb 12, 2024
1af9c34
make coding for chunking for generic for other location models
bwentl Feb 12, 2024
0f1e312
Merge branch 'location_estimation_patch_main' of https://github.com/T…
bwentl Feb 12, 2024
db03dae
Merge pull request #11 from camsys/data-type-op-pd-cat
i-am-sijia Feb 13, 2024
1f42cd3
Merge pull request #782 from wsp-sag/data-type-op-pd-cat
jpn-- Feb 13, 2024
229bd87
install altair for devs
jpn-- Feb 13, 2024
3b8e4cd
Merge commit '1f42cd3659171f9e353806067859baf146f6ecbe' into perf-fix
jpn-- Feb 13, 2024
ba30a63
ignore missing injectables for MP
jpn-- Feb 13, 2024
27e67ab
external mtc-ext example
jpn-- Feb 13, 2024
494f0a1
fix logging call warning
jpn-- Feb 13, 2024
e2ed3a0
Merge pull request #798 from TransLinkForecasting/location_estimation…
jpn-- Feb 13, 2024
04d64ff
Merge branch 'develop' into perf-fix
jpn-- Feb 13, 2024
4a2b2f2
fix input_checker runtime
jpn-- Feb 14, 2024
bb01cdc
repair landuse check
jpn-- Feb 14, 2024
5799535
Merge pull request #797 from camsys/perf-fix
jpn-- Feb 14, 2024
c0305bd
Merge pull request #800 from ActivitySim/develop
jpn-- Feb 14, 2024
c9e72a8
cleanup_failed_trips requires state
jpn-- Feb 15, 2024
9c5d057
remove code duplication
jpn-- Feb 15, 2024
03a6720
Merge pull request #801 from camsys/bugfix-801
jpn-- Feb 16, 2024
37b55ec
explicit chunking for interaction-simulate components
jpn-- Feb 19, 2024
2997011
remove old configuration file (bad merge)
jpn-- Feb 19, 2024
12c04f6
docstring
jpn-- Feb 19, 2024
73d89ba
alt preprocessor, column selection
dhensle Feb 19, 2024
0a4b548
generate stable vehicle type dtype categories
jpn-- Feb 20, 2024
eed6e9d
fix null atwork freq
jpn-- Feb 20, 2024
6f8c741
use default versioning scheme not simplified
jpn-- Feb 20, 2024
10d105a
Merge pull request #806 from dhensle/veh_type_optimization
jpn-- Feb 20, 2024
b720de7
Merge pull request #803 from camsys/bugfix-code-dupe
jpn-- Feb 20, 2024
a00a43e
Merge pull request #808 from camsys/fix-null-atwork-freq
jpn-- Feb 20, 2024
7513a1f
Merge pull request #807 from camsys/fix-vehicle-type-sorting
jpn-- Feb 20, 2024
30a1ef8
Merge pull request #804 from camsys/explicitchunk-veh
jpn-- Feb 20, 2024
8fbce63
update README
jpn-- Feb 20, 2024
ff3e96b
Merge pull request #809 from camsys/fix-version-scheme
jpn-- Feb 20, 2024
d228154
only households with escortees as choosers
dhensle Feb 22, 2024
c283287
build updates
jpn-- Feb 22, 2024
4cf376d
manual test
jpn-- Feb 22, 2024
28bc0f0
exclude tests from wheel
jpn-- Feb 22, 2024
422202a
allow testing in forks
jpn-- Feb 22, 2024
ba3584f
use setuptools>=69
jpn-- Feb 22, 2024
2debadb
no more bug
jpn-- Feb 22, 2024
0f22e28
increase req-python to 3.10
jpn-- Feb 22, 2024
2ee307e
make `sparse` a required dependency
jpn-- Feb 22, 2024
525fd7c
no categories for escort participants
jpn-- Feb 22, 2024
49e792d
fix inconsistent alts object name
i-am-sijia Feb 26, 2024
7d65293
Merge pull request #813 from camsys/no-cats-escort-participant
jpn-- Feb 26, 2024
c151940
Merge pull request #810 from dhensle/school_escorting_optimization
jpn-- Feb 26, 2024
5e6795e
Merge branch 'ActivitySim:main' into main
jpn-- Feb 26, 2024
30204a7
set time period to categorical in legacy mode
i-am-sijia Feb 26, 2024
4eb1c92
set time period to categorical in legacy mode
i-am-sijia Feb 26, 2024
c94016d
Merge branch 'time-period-cat-legacy-mode' of https://github.com/wsp-…
i-am-sijia Feb 26, 2024
88043d4
fail protection for existing unit tests that do not initialize state.…
i-am-sijia Feb 27, 2024
dddf34f
blacken
i-am-sijia Feb 27, 2024
3060911
Merge pull request #817 from wsp-sag/jtfc-alts-obj-name
jpn-- Feb 27, 2024
64cacd2
Merge pull request #819 from wsp-sag/time-period-cat-legacy-mode
jpn-- Feb 27, 2024
2f9afa0
Merge pull request #812 from camsys/main
jpn-- Feb 28, 2024
27895e2
veh type categorical
jpn-- Mar 4, 2024
fc98039
remove empty string as vehicle type, allow normal missing cat value
jpn-- Mar 5, 2024
a08edd4
git ignore workflow outputs
jpn-- Mar 6, 2024
3af9202
preprocessor and annotation in auto ownership
dhensle Dec 16, 2023
6d817be
Merge pull request #829 from camsys/patch-gitignore-workflow-outputs
jpn-- Mar 7, 2024
5518ca4
error out of infinite loop
dhensle Dec 16, 2023
0630659
landuse and reindex in loc choice
dhensle Dec 16, 2023
4201d36
landuse available in trip destination
dhensle Dec 16, 2023
48be6f4
replace orca inject with state object
dhensle Mar 7, 2024
ed20f51
blacken
dhensle Mar 8, 2024
cdcca91
mode choice logsum extraction
dhensle Dec 16, 2023
b955295
blacken
dhensle Dec 18, 2023
90b0b8c
Only want joint tours for joint tour dest model -- got dropped in rebase
dhensle Mar 8, 2024
fe0c284
fix Nones to None typo
dhensle Mar 8, 2024
c0357fb
remove old path to estimaton.py
dhensle Mar 8, 2024
3c7bba4
preprocessor and annotate_households settings
dhensle Mar 8, 2024
d1f4db8
call ALT_DEST_COL_NAME as attribute
dhensle Mar 8, 2024
ba1aac8
blacken
dhensle Mar 8, 2024
9af5c3b
Merge pull request #826 from camsys/veh-type-categorical
jpn-- Mar 18, 2024
4c766b6
Merge pull request #767 from SANDAG/BayDAG_cont1_auto_own_processors
jpn-- Mar 18, 2024
85615e4
Merge pull request #772 from SANDAG/BayDAG_cont6_jtp_infinite_loop
jpn-- Mar 19, 2024
ff61744
Merge pull request #770 from SANDAG/BayDAG_cont4_jtd_just_joint
jpn-- Mar 19, 2024
94c4db8
Merge pull request #774 from SANDAG/BayDAG_cont8_lu_and_reindex_in_lo…
jpn-- Mar 19, 2024
bf074a5
Merge pull request #775 from SANDAG/BayDAG_cont9_mc_logsum
jpn-- Mar 26, 2024
97e45b7
BayDAG Contribution #2: Enhanced Disaggregate Accessibility Merging (…
dhensle Mar 28, 2024
27d5b36
BayDAG Contribution #15: Larch Interface for Added Models (#781)
dhensle Mar 28, 2024
1453d87
Alt name for jtfc estimation mode (#771)
dhensle Mar 28, 2024
bfee887
BayDAG Contribution #7: Sampling in EDB for Location Choice (#773)
dhensle Mar 28, 2024
f15486c
Changed Environment YML (#832)
lachlan-git Mar 28, 2024
ade9aa4
BayDAG Contribution #3: CDAP estimation with joint component (#769)
dhensle Apr 1, 2024
216c81a
BayDAG Contribution #10: NMTF Person Available Periods (#776)
dhensle Apr 1, 2024
0a119ad
BayDAG Contribution #13: Estimation Mode Usability (#779)
dhensle Apr 1, 2024
2540ede
BayDAG Contribution #14: Increasing Larch Loading for NMTF (#780)
dhensle Apr 1, 2024
5111c79
pin pandera (#843)
jpn-- Apr 3, 2024
bb437b3
fix bug in reflow (#839)
jpn-- Apr 3, 2024
739c2e4
BayDAG Contribution #11: School Escorting Estimation Updates (#777)
dhensle Apr 4, 2024
c5bab95
BayDAG Contribution #16: Parking Locations in Trip Matrices (#840)
dhensle Apr 18, 2024
751ee44
Common settings for fastmath, sharrow_skip, and other compute control…
jpn-- Apr 18, 2024
8e1fbcd
BayDAG All Contributions (#834)
dhensle Apr 19, 2024
239f415
Automatically drop unneeded columns in choosers table (#833)
i-am-sijia Apr 21, 2024
ed2122f
add nd_skims for sharrow flows on trip dest (#852)
jpn-- Apr 21, 2024
652883a
add rtol on progressive testing (#855)
jpn-- Apr 22, 2024
514ed03
allow input checker aux files to be parquet (#851)
jpn-- Apr 22, 2024
4085bfc
Various minor fixes (#856)
jpn-- Apr 23, 2024
a1fe812
initial configs merge
zneedell Apr 23, 2024
162e602
more configs merge
zneedell Apr 23, 2024
c424b69
working up through generate_beam_plans
zneedell Apr 24, 2024
67fa08e
School Escorting Runtime Optimization (#828)
dhensle Apr 24, 2024
ccd0477
allow skims in trip mode choice annotate (#857)
dhensle Apr 24, 2024
0245d16
make beam_pllans a table rather than a step
zneedell Apr 25, 2024
4e3f96a
fixing #841 (#854)
dhensle Apr 25, 2024
50c05c5
state.run.all should allow memory profiling (#859)
jpn-- Apr 25, 2024
e309b84
ensure tour_type is categorical (#863)
jpn-- May 2, 2024
1cb48c7
Trip Destination Alternatives Preprocessor (#865)
dhensle May 6, 2024
564c476
Trip destination alts preprocessor for both sample and simulate steps…
dhensle May 14, 2024
f31bfe5
`protect_columns` for all simulations (choosers, alts, simple simulat…
i-am-sijia May 21, 2024
d8c5829
`joint_tour_frequency_composition` column to categorical (#866)
i-am-sijia May 21, 2024
29d12bc
Explicit chunking on all interaction simulate models (#870)
dhensle May 22, 2024
bd48d3d
require numpy<2.x (#875)
jpn-- Jun 20, 2024
28a0ad0
Changes to support sharrow on 2-zone model (#867)
jpn-- Jul 3, 2024
67820ad
integer encoding vehicle allocation spec (#877)
dhensle Jul 13, 2024
2b22556
new two zone sfbay configs
zneedell Jul 25, 2024
bde62c9
update maz inputs
zneedell Jul 25, 2024
dc9978f
update maz inputs
zneedell Jul 25, 2024
c0411e8
update maz inputs
zneedell Jul 25, 2024
545ed0e
update maz inputs
zneedell Jul 25, 2024
15e2d03
update maz inputs
zneedell Jul 25, 2024
31ef091
update maz inputs
zneedell Jul 26, 2024
cc1db3e
update maz inputs
zneedell Jul 26, 2024
701fea5
update maz inputs
zneedell Jul 26, 2024
73bb7ca
settings upddates
zneedell Jul 26, 2024
b3e732d
taz file
zneedell Jul 26, 2024
19e57f4
config fix?
zneedell Jul 26, 2024
788eb82
config fix?
zneedell Jul 26, 2024
f2fb8fc
config fix?
zneedell Jul 26, 2024
7d65821
land use fix
zneedell Jul 26, 2024
d81f5f2
Performance docs (#878)
jpn-- Jul 26, 2024
e023b1b
new bg scenario
zneedell Jul 26, 2024
5bfd346
scenario bugfix
zneedell Jul 26, 2024
ee2fb73
maz data
zneedell Jul 29, 2024
c252225
dockerignore
zneedell Jul 29, 2024
2bd026e
squashed commits from telework branch
zneedell Mar 11, 2024
53aa11d
nan prob fixes
zneedell Nov 12, 2023
3dbb95a
bugfix
zneedell Jul 29, 2024
f3ed169
bugfix
zneedell Jul 29, 2024
e25d75f
bugfix
zneedell Jul 29, 2024
c8d6744
bugfix
zneedell Jul 29, 2024
e215f30
config updates
zneedell Jul 29, 2024
df81a4f
config updates
zneedell Jul 29, 2024
9181390
Release notes v1.3 (#882)
jpn-- Aug 8, 2024
c6aa6d7
Bugfix for trip scheduling choice (#884)
jpn-- Aug 9, 2024
084dee3
Fix docs, add performance report (#885)
jpn-- Aug 17, 2024
bc5b6c3
fox outdated dependency list in pyproject (#886)
jpn-- Aug 20, 2024
69038fc
Fix installer (#887)
jpn-- Sep 2, 2024
ecb00b5
Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows …
dependabot[bot] Sep 19, 2024
cecb570
Sharrow Cache Dir Setting (#893)
dhensle Oct 24, 2024
3d255d0
github action updates (#903)
jpn-- Oct 29, 2024
82a896e
python version update (#910)
dhensle Dec 12, 2024
46feabe
Skip nesting coefficient evaluation when evaluating logsums using MNL…
JoeJimFlood Dec 12, 2024
f2b97f1
docs(example_performance.md): correct a sub-heading (#896)
asiripanich Dec 12, 2024
171f172
update core-tests (#916)
jpn-- Dec 13, 2024
ead6c43
Merge remote-tracking branch 'asim/main' into new-merge-lbl
zneedell Jan 13, 2025
bf64b7b
Resolve package version conflicts (#923)
yueshuaing Feb 25, 2025
39c5e12
GitHub Actions updates (#926)
jpn-- Mar 5, 2025
8e17c61
trace proto tables if available, otherwise synthetic population (#901)
dhensle Mar 5, 2025
9991fce
release instructions (#927)
jpn-- Mar 5, 2025
4abb86f
Use pandas 2 for docbuild environment (#928)
jpn-- Mar 6, 2025
258e5ee
Update HOW_TO_RELEASE.md
jpn-- Mar 17, 2025
c8a2036
Merge remote-tracking branch 'asim/main' into new-merge-lbl
zneedell Mar 17, 2025
e65eac2
add generate_beam_plans.py
zneedell Mar 17, 2025
c59dc4c
refactor(shadow_pricing.py): remove a duplicated `default_segment_to_…
asiripanich Mar 18, 2025
1c6b4b4
Fixes to get generate_beam_plans to run
zneedell Mar 18, 2025
c6e4276
More fixes
zneedell Mar 26, 2025
85f4b7d
dumb bug
zneedell Mar 26, 2025
1317d4d
fix indexing bug in generate_beam_plans.py
zneedell Mar 28, 2025
ec50b37
Merge remote-tracking branch 'refs/remotes/asim/main' into new-merge-lbl
zneedell Apr 1, 2025
60b63cd
departure time fix
zneedell Apr 2, 2025
8aa0899
fix warning
zneedell Apr 2, 2025
9e5bbc7
do not check for age of zarr skims
zneedell Apr 4, 2025
b6ac708
fix warnings
zneedell May 15, 2025
336f4c6
disallow home -> home and work -> work trips in beam plans
zneedell May 15, 2025
d16169b
switch to graph based rearranging
zneedell May 16, 2025
cefb2c2
clean up some printing
zneedell May 19, 2025
6b0c254
more logging cleanup
zneedell May 19, 2025
b559760
Allow separate random seed for household sampling
zneedell May 19, 2025
0ee0da7
selective deleting of pipeline files for asim-lite replanning
zneedell May 19, 2025
c8ef3bf
fix dtype error in generate_beam_plans.py
zneedell May 19, 2025
259977a
random seed updates
zneedell Jun 13, 2025
8869c9e
add calibration wrapper
zneedell Jun 13, 2025
abd8d0e
seems to be working
zneedell Jun 13, 2025
714df78
everything working except logging
zneedell Jun 13, 2025
eb167a1
small updates
zneedell Jun 13, 2025
5140168
small updates
zneedell Nov 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 17 additions & 0 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[bumpversion]
current_version = 1.1.0
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>.*))?
serialize =
{major}.{minor}.{patch}.{release}
{major}.{minor}.{patch}

[bumpversion:part:release]
optional_value = final
first_value = final
values =
dev
final

[bumpversion:file:activitysim/__init__.py]
20 changes: 20 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
*/data/*
*/output/*
*/notebooks/*
*/cache/*
.git
*.omx
*.mmap
*.log
*.parquet
*.h5
*/examples/example*/*
*/test_*/*
*/example_mtc/*
*/example_estimation/*
*/prototype_mwcog/*
*/prototype_sandag_xborder/*
*/prototype_marin/*
*/prototype_arc/*
*/production_semcog/*
*/placeholder_psrc/*
27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: Bug
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: Feature
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
70 changes: 70 additions & 0 deletions .github/workflows/branch-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: ActivitySim Branch Docs
# This workflow is provided as a service for forks to build branch-specific documentation.

on:
- push
- workflow_dispatch

jobs:
docbuild:
if: "contains(github.event.head_commit.message, '[makedocs]') && (github.repository_owner != 'ActivitySim') && (github.ref_name != 'develop')"
# develop branch docs are built at the end of the core test workflow, regardless of repository owner or commit message flags
name: ubuntu-latest py3.10
runs-on: ubuntu-latest
permissions:
contents: write
defaults:
run:
shell: bash -l {0}
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # get all tags, lets setuptools_scm do its thing

- name: Setup Miniforge
uses: conda-incubator/setup-miniconda@v2
with:
miniforge-version: latest
python-version: "3.10"
activate-environment: docbuild
auto-activate-base: false
auto-update-conda: false

- name: Set cache date for year and month
run: echo "DATE=$(date +'%Y%m')" >> $GITHUB_ENV

- uses: actions/cache@v3
with:
path: /usr/share/miniconda3/envs/docbuild
key: linux-64-conda-${{ hashFiles('conda-environments/docbuild.yml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
id: cache

- name: Update environment
run: conda env update --verbose -n docbuild -f conda-environments/docbuild.yml
if: steps.cache.outputs.cache-hit != 'true'

- name: Install activitysim
run: |
python -m pip install .

- name: Conda checkup
run: |
conda info -a
conda list
echo REPOSITORY ${{ github.repository }}
echo REF ${{ github.ref }}
echo REF_NAME ${{ github.ref_name }}

- name: Build the docs
run: |
cd docs
make clean
make html

- name: Push to GitHub Pages
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
# Token is created automatically by Github Actions, no other config needed
publish_dir: ./docs/_build/html
destination_dir: ${{ github.ref_name }}
63 changes: 63 additions & 0 deletions .github/workflows/build_installer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Build installer
on:
workflow_dispatch:
inputs:
version:
description: 'Build installer for version (e.g. "1.0.4")'
required: true
type: string
release:
description: 'Upload as release artifact'
required: true
type: boolean

jobs:
build:
name: ActivitySim-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: windows-latest
ARCH: x86_64
TARGET_PLATFORM: win-64
OS_NAME: "Windows"

steps:
- name: Checkout code
uses: actions/checkout@v4

- uses: conda-incubator/setup-miniconda@v3
with:
miniconda-version: "latest"
if: contains(matrix.OS_NAME, 'Windows')

- name: Build installer
env:
ARCH: ${{ matrix.ARCH }}
OS_NAME: ${{ matrix.OS_NAME }}
TARGET_PLATFORM: ${{ matrix.TARGET_PLATFORM }}
run: |
export ACTIVITYSIM_VERSION=${{ inputs.version }}
export EXT=exe
source /c/Users/runneradmin/miniconda3/Scripts/activate;
source other_resources/installer/build_win.sh;
ls -alh build
shell: bash

- name: Upload installer to Github artifact
uses: actions/upload-artifact@v4
with:
path: build/Activitysim-${{ inputs.version }}-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}*
name: Activitysim-${{ inputs.version }}-${{ matrix.OS_NAME }}-${{ matrix.ARCH }}

- name: Upload installer to release
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: build/Activitysim*
tag: v${{ inputs.version }}
overwrite: true
file_glob: true
if: inputs.release
52 changes: 52 additions & 0 deletions .github/workflows/config-testpypi-version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
from __future__ import annotations

import argparse
import copy
import pathlib

import tomli
import tomli_w


def split_path(path, sep="/"):
if isinstance(path, str):
return [part for part in path.split(sep) if part]
else:
return path


def extract(mapping, path, sep="/"):
parts = split_path(path, sep=sep)
cur = mapping
for part in parts:
cur = cur[part]

return cur


def update(mapping, path, value, sep="/"):
new = copy.deepcopy(mapping)

parts = split_path(path, sep=sep)
parent = extract(new, parts[:-1])
parent[parts[-1]] = value

return new


parser = argparse.ArgumentParser()
parser.add_argument("path", type=pathlib.Path)
args = parser.parse_args()

content = args.path.read_text()
decoded = tomli.loads(content)
with_local_scheme = update(
decoded, "tool.setuptools_scm.local_scheme", "no-local-version", sep="."
)
# work around a bug in setuptools / setuptools-scm
with_setuptools_pin = copy.deepcopy(with_local_scheme)
requires = extract(with_setuptools_pin, "build-system.requires", sep=".")
# requires[0] = "setuptools>=42,<60"

new_content = tomli_w.dumps(with_setuptools_pin)
args.path.write_text(new_content)
Loading
Loading