From de1e319eff168628a53e6af4eea797df344f9323 Mon Sep 17 00:00:00 2001 From: Eric Larson Date: Wed, 24 Feb 2021 13:13:18 -0500 Subject: [PATCH] MAINT: CI --- environment.yml | 4 ++-- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environment.yml b/environment.yml index ef377047ee8..61ed29158a8 100644 --- a/environment.yml +++ b/environment.yml @@ -19,7 +19,7 @@ dependencies: - psutil - numexpr - traits -- pyface +- pyface!=7.3.0 - traitsui - imageio - tqdm @@ -34,6 +34,6 @@ dependencies: - nibabel - nilearn - python-picard -- pyqt +- pyqt!=5.15.3 - mne - mffpy>=0.5.7 diff --git a/requirements.txt b/requirements.txt index 8170c7189e6..3c39ef0f241 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ numpy>=1.15.4 scipy>=1.1.0 matplotlib pyqt5>=5.10,<5.14; platform_system == "Darwin" -pyqt5>=5.10,!=5.15.2; platform_system == "Linux" -pyqt5>=5.10; platform_system != "Linux" and platform_system != "Darwin" +pyqt5>=5.10,!=5.15.2,!=5.15.3; platform_system == "Linux" +pyqt5>=5.10,!=5.15.3; platform_system != "Linux" and platform_system != "Darwin" pyqt5-sip sip scikit-learn