Skip to content

Fixed numpy version and constructor calling. #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pellet merged 3 commits into from
May 21, 2026
Merged

Fixed numpy version and constructor calling. #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c59585
fixed numpy version and constructor calling
pellet May 21, 2026
4070a6d
fixed versioning to use latest 3.11.x version for experimental builds
pellet May 21, 2026
f13989b
Merge branch 'master' into master
pellet May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eegnb/experiments/BlockExperiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion environments/eeg-expy-full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channels:
- defaults
dependencies:
# System-level dependencies
- python>=3.10,<3.12 # psychopy 2026.x requires py3.10; <3.12 allows latest 3.11.x patch 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
Expand Down
8 changes: 2 additions & 6 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading