numpy max 1.21#540

jpn-- merged 2 commits intoActivitySim:developActivitySim/activitysim:developfrom

jpn--:numpy-pinjpn--/activitysim:numpy-pinCopy head branch name to clipboard