Temporary fix in psana envs for issue #627

Also unpin wxpython, no longer needed after 79108f4
cctbx · Jun 25, 2021 · 89fa300 · 89fa300
1 parent 95018ab
commit 89fa300
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/xfel/conda_envs/psana_environment.yml b/xfel/conda_envs/psana_environment.yml
@@ -30,7 +30,7 @@ dependencies:
  # graphics
  - pillow
  - reportlab
- - wxpython=4.0.*
+ - wxpython
  - pyopengl
 
  # HDF5 (main libraries come with psana)
@@ -67,3 +67,7 @@ dependencies:
  # xfel gui
  - mysql
  - mysql-connector-python
+
+ # temporarily pin numpy version
+ # See https://github.com/cctbx/cctbx_project/issues/627
+ - numpy=1.20
diff --git a/xfel/conda_envs/psana_lcls_environment.yml b/xfel/conda_envs/psana_lcls_environment.yml
@@ -70,3 +70,7 @@ dependencies:
  # xfel gui
  - mysql
  - mysql-connector-python
+
+ # temporarily pin numpy version
+ # See https://github.com/cctbx/cctbx_project/issues/627
+ - numpy=1.20