Start allowing new numpy versions >=1.21.5

This reflects the resolution of #627 as discussed in several other issues and PRs: - boostorg/python#376 - numpy/numpy#20507 - numpy/numpy#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 <[email protected]>
cctbx · Jan 4, 2022 · 2b0dfe2 · 2b0dfe2
1 parent 201b8ee
commit 2b0dfe2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/xfel/conda_envs/psana_environment.yml b/xfel/conda_envs/psana_environment.yml
@@ -70,6 +70,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
@@ -73,6 +73,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