Skip to content

Commit 08047d1

Browse files
committed
revert non-essential changes
1 parent 49914d3 commit 08047d1

File tree

9 files changed

+18
-366
lines changed

9 files changed

+18
-366
lines changed

.github/workflows/docs.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@ jobs:
2020
with:
2121
python-version: 3.8
2222

23-
- name: Install conda
24-
uses: conda-incubator/setup-miniconda@v3
25-
with:
26-
environment-file: environments/eeg-expy-docsbuild.yml
27-
auto-activate-base: false
28-
python-version: ${{ matrix.python_version }}
29-
activate-environment: eeg-expy-full
30-
channels: conda-forge
31-
miniconda-version: "latest"
23+
- name: Install dependencies
24+
run: |
25+
make install-deps-apt
26+
python -m pip install --upgrade pip wheel
27+
python -m pip install attrdict
28+
29+
make install-deps-wxpython
3230
3331
- name: Build project
3432
run: |

eegnb/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ def _get_recording_dir(
3636
)
3737

3838
# check if directory exists, if not, make the directory
39-
# Skip directory creation if wildcards are present (for pattern matching)
40-
if not any('*' in str(part) for part in [subject_str, session_str]) and not path.exists(recording_dir):
39+
if not path.exists(recording_dir):
4140
makedirs(recording_dir)
4241

4342
return recording_dir

environments/eeg-expy-docsbuild.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1+
name: eeg-expy-docsbuild
12
channels:
23
- conda-forge
34
dependencies:
45
# System-level dependencies
5-
6-
# conda overrides current environment python version when not using --freeze-installed, and installs a random version of python...
7-
# - python>=3.8,<=3.13
8-
6+
- python>=3.8,<=3.13
97
- pytables # install pytables for macOS arm64, so do not need to build from source.
108
- rust # used by docsbuild
119
- pip

environments/eeg-expy-full.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1+
name: eeg-expy-full
12
channels:
23
- conda-forge
34
dependencies:
45
# System-level dependencies
5-
6-
# conda overrides current environment python version when not using --freeze-installed, and installs a random version of python...
7-
# - python>=3.8,<=3.10 # psychopy <= 3.10
8-
6+
- python>=3.8,<=3.10 # psychopy <= 3.10
97
- dukpy==0.2.3 # psychopy dependency, avoid failing due to building wheel on win 3.9.
108
- numpy # fix PsychXR numpy dependency DLL issues on Windows
119
- pytables # install pytables for macOS arm64, so do not need to build from source.

environments/eeg-expy-stimpres.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1+
name: eeg-expy-stimpres
12
channels:
23
- conda-forge
34
dependencies:
45
# System-level dependencies
5-
6-
# conda overrides current environment python version when not using --freeze-installed, and installs a random version of python...
7-
#- python>=3.8,<=3.10 # psychopy <= 3.10
8-
6+
- python>=3.8,<=3.10 # psychopy <= 3.10
97
- dukpy==0.2.3 # psychopy dependency, avoid failing due to building wheel on win 3.9.
108
- wxpython>=4.0 # install wxpython to prevent error on macOS arm64: "site-packages/wx/_core.cpython-38-darwin.so, 0x0002): symbol not found in flat namespace '__ZN10wxBoxSizer20InformFirstDirectionEiii'"
119
- cffi # Fix sound ffi.callback() issue with sounddevice on macOS: https://github.com/spatialaudio/python-sounddevice/issues/397

environments/eeg-expy-streaming.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1+
name: eeg-expy-streaming
12
channels:
23
- conda-forge
34
dependencies:
45
# System-level dependencies
5-
6-
# conda overrides current environment python version when not using --freeze-installed, and installs a random version of python...
7-
#- python>=3.8,<=3.13
8-
6+
- python>=3.8,<=3.13
97
- liblsl # install liblsl to prevent error on macOS and Ubuntu: "RuntimeError: LSL binary library file was not found."
108
- pip
119
- pip:

environments/eeg-expy-streamstim.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1+
name: eeg-expy-streamstim
12
channels:
23
- conda-forge
34
- defaults
45
dependencies:
56
# System-level dependencies
6-
7-
# conda overrides current environment python version when not using --freeze-installed, and installs a random version of python...
8-
#- python>=3.8,<=3.10 # psychopy <= 3.10
9-
7+
- python>=3.8,<=3.10 # psychopy <= 3.10
108
- dukpy==0.2.3 # psychopy dependency, avoid failing due to building wheel on win 3.9.
119
- liblsl # install liblsl to prevent error on macOS and Ubuntu: "RuntimeError: LSL binary library file was not found."
1210
- wxpython>=4.0 # install wxpython to prevent error on macOS arm64: "site-packages/wx/_core.cpython-38-darwin.so, 0x0002): symbol not found in flat namespace '__ZN10wxBoxSizer20InformFirstDirectionEiii'"

examples/visual_block_pattern_reversal/00x__block_pattern_reversal_run_experiment.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)