From 8b442d113a88a643645b082bc8dcac9cb3ab5aba Mon Sep 17 00:00:00 2001 From: Daniel Paley Date: Wed, 5 Jan 2022 09:37:49 -0500 Subject: [PATCH] Start allowing new numpy versions >=1.21.5 (#708) This reflects the resolution of #627 as discussed in several other issues and PRs: - https://github.com/boostorg/python/issues/376 - https://github.com/numpy/numpy/pull/20507 - https://github.com/numpy/numpy/pull/20616 Leaving this "bibliography" here because the fix in numpy PR 20616 is considered temporary; thus someday we may have to revisit this to fix the underlying bug in boost::python. Co-authored-by: Billy Poon --- xfel/conda_envs/psana_environment.yml | 4 ++-- xfel/conda_envs/psana_lcls_environment.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xfel/conda_envs/psana_environment.yml b/xfel/conda_envs/psana_environment.yml index 9dd9554815..9a1048e81d 100644 --- a/xfel/conda_envs/psana_environment.yml +++ b/xfel/conda_envs/psana_environment.yml @@ -71,6 +71,6 @@ dependencies: - mysql - mysqlclient - # temporarily pin numpy version + # Avoid numpy 1.21.[01234] # See https://github.com/cctbx/cctbx_project/issues/627 - - numpy=1.20 + - numpy=1.20|>=1.21.5 diff --git a/xfel/conda_envs/psana_lcls_environment.yml b/xfel/conda_envs/psana_lcls_environment.yml index 8ea04c797d..51864806df 100644 --- a/xfel/conda_envs/psana_lcls_environment.yml +++ b/xfel/conda_envs/psana_lcls_environment.yml @@ -74,6 +74,6 @@ dependencies: - mysql - mysqlclient - # temporarily pin numpy version + # Avoid numpy 1.21.[01234] # See https://github.com/cctbx/cctbx_project/issues/627 - - numpy=1.20 + - numpy=1.20|>=1.21.5