From aa6903784ee1f6ec1453e433ea0dbf56f68cd4e6 Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Tue, 22 Feb 2022 12:39:00 -0600 Subject: [PATCH 1/2] numpy max 1.21 closes #533 --- conda-environments/activitysim-dev.yml | 2 +- conda-environments/activitysim-test-larch.yml | 2 +- conda-environments/activitysim-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conda-environments/activitysim-dev.yml b/conda-environments/activitysim-dev.yml index e8c2db0db9..c6957016f4 100644 --- a/conda-environments/activitysim-dev.yml +++ b/conda-environments/activitysim-dev.yml @@ -5,7 +5,7 @@ channels: dependencies: - python=3.9 - pip -- numpy >= 1.16.1 +- numpy >= 1.16.1,<=1.21 - pandas >= 1.1.0 - pyarrow >= 2.0 - openmatrix >= 0.3.4.1 diff --git a/conda-environments/activitysim-test-larch.yml b/conda-environments/activitysim-test-larch.yml index 474736b430..ddfc6d3ef8 100644 --- a/conda-environments/activitysim-test-larch.yml +++ b/conda-environments/activitysim-test-larch.yml @@ -6,7 +6,7 @@ channels: dependencies: - python=${TRAVIS_PYTHON_VERSION} - pip -- numpy >= 1.16.1 +- numpy >= 1.16.1,<=1.21 - pandas >= 1.1.0 - pyarrow >= 2.0 - openmatrix >= 0.3.4.1 diff --git a/conda-environments/activitysim-test.yml b/conda-environments/activitysim-test.yml index 6ca5270bd0..d46316e63c 100644 --- a/conda-environments/activitysim-test.yml +++ b/conda-environments/activitysim-test.yml @@ -6,7 +6,7 @@ channels: dependencies: - python=${TRAVIS_PYTHON_VERSION} - pip -- numpy >= 1.16.1 +- numpy >= 1.16.1,<=1.21 - pandas >= 1.1.0 - pyarrow >= 2.0 - openmatrix >= 0.3.4.1 From 91942ea104712f09c342f571cd2c684816359c8b Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Wed, 23 Feb 2022 13:21:26 -0600 Subject: [PATCH 2/2] extra larch dependencies for asim estimation --- conda-environments/activitysim-test-larch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-environments/activitysim-test-larch.yml b/conda-environments/activitysim-test-larch.yml index ddfc6d3ef8..b773c3aa23 100644 --- a/conda-environments/activitysim-test-larch.yml +++ b/conda-environments/activitysim-test-larch.yml @@ -23,3 +23,5 @@ dependencies: - coveralls - pycodestyle - pytest-regressions +- xarray +- sharrow