From 6c59585a44cf0ec44093ec0f1df8e0ddad7a6c68 Mon Sep 17 00:00:00 2001 From: Benjamin Pettit Date: Thu, 21 May 2026 20:00:01 +1000 Subject: [PATCH 1/2] fixed numpy version and constructor calling --- eegnb/experiments/BlockExperiment.py | 4 ++-- requirements.txt | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/eegnb/experiments/BlockExperiment.py b/eegnb/experiments/BlockExperiment.py index ae4e48256..88c316b48 100644 --- a/eegnb/experiments/BlockExperiment.py +++ b/eegnb/experiments/BlockExperiment.py @@ -22,7 +22,7 @@ class BlockExperiment(BaseExperiment, ABC): """ def __init__(self, exp_name, block_duration, eeg, save_fn, block_trial_size, n_blocks, iti: float, soa: float, jitter: float, - use_vr=False, use_fullscr=True, stereoscopic=False): + use_vr=False, use_fullscr=True, screen_num=0, stereoscopic=False, devices = list): """ Initializer for the BlockExperiment Class Args: @@ -43,7 +43,7 @@ def __init__(self, exp_name, block_duration, eeg, save_fn, block_trial_size, n_b # Initialize BaseExperiment with total trials # Pass None for duration if block_duration is None to ignore time spent in instructions - super().__init__(exp_name, block_duration, eeg, save_fn, total_trials, iti, soa, jitter, use_vr, use_fullscr, stereoscopic) + super().__init__(exp_name, block_duration, eeg, save_fn, total_trials, iti, soa, jitter, use_vr, use_fullscr, screen_num, stereoscopic, devices) # Block-specific parameters self.block_duration = block_duration diff --git a/requirements.txt b/requirements.txt index bfa2887ac..772bb5143 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,9 +3,7 @@ scikit-learn>=0.23.2 pandas>=1.1.4 -# psychxr build pinned to this version of numpy. -numpy>=1.26,<1.27; python_version >= "3.9" -numpy<=1.24.4; python_version == "3.8" +numpy>=1.26.0 mne>=0.20.8 seaborn>=0.11.0 pyriemann>=0.2.7 @@ -60,9 +58,7 @@ ffpyplayer==4.5.2 # 4.5.3 fails to build as wheel. psychtoolbox scikit-learn>=0.23.2 pandas>=1.1.4 -# psychxr build pinned to this version of numpy. -numpy>=1.26,<1.27; python_version >= "3.9" -numpy==1.24.4; python_version == "3.8" +numpy>=1.26.0 mne>=0.20.8 seaborn>=0.11.0 pysocks>=1.7.1 From 4070a6d4230e8451e11d7eb4d370d41877b61039 Mon Sep 17 00:00:00 2001 From: Benjamin Pettit Date: Thu, 21 May 2026 20:04:19 +1000 Subject: [PATCH 2/2] fixed versioning to use latest 3.11.x version for experimental builds --- environments/eeg-expy-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/eeg-expy-full.yml b/environments/eeg-expy-full.yml index 2e096c6dc..1c24c26b2 100644 --- a/environments/eeg-expy-full.yml +++ b/environments/eeg-expy-full.yml @@ -3,7 +3,7 @@ channels: - defaults dependencies: # System-level dependencies - - python>=3.10,<=3.11 # psychopy 2026.x requires py3.10; higher versions for experimental builds + - python>=3.10,<3.12 # psychopy 2026.x requires py3.10; higher versions for experimental builds - setuptools - dukpy==0.2.3 # psychopy dependency, avoid failing due to building wheel on win 3.9. - numpy # fix PsychXR numpy dependency DLL issues on Windows