Skip to content

Commit

Permalink
Merge branch 'rc'
Browse files Browse the repository at this point in the history
# Conflicts:
#	iblrig/__init__.py
#	release_notes.md
  • Loading branch information
Michele Fabbri committed Oct 17, 2022
2 parents 876aa26 + 9f0af6e commit 30b77f9
Show file tree
Hide file tree
Showing 116 changed files with 11,327 additions and 491 deletions.
4 changes: 3 additions & 1 deletion .flake8
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
[flake8]
max-line-length = 130
exclude =
.git,
scratch_*.py,
Bonsai/
Bonsai,
venv
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml → .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
conda create --name ibllib python=3.8 --yes
conda activate ibllib
pip install ibllib
python -c "from one.api import ONE; ONE(base_url='https://test.alyx.internationalbrainlab.org', username='test_user', password='TapetesBloc18', silent=True, cache_rest=None)"
python -c "from one.api import ONE; ONE(base_url='https://test.alyx.internationalbrainlab.org', username='test_user', password='TapetesBloc18', silent=True)"
- name: iblrig unit tests
shell: pwsh -l {0}
Expand Down
46 changes: 44 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# iblrig v7
Software used to interact with various pieces of specialized hardware for neuroscience data acquisition.

## Installation on Windows
Software has only been tested on Windows 10. No other version of Windows is supported at this time. The test user account has
administrative rights.
Expand Down Expand Up @@ -63,9 +65,15 @@ the tasks listed in the `add_ex_desc_gui_to_tasks` script, run the following com
conda activate iblrig
git clone -b develop https://github.com/int-brain-lab/iblscripts C:\iblscripts
pip install -r C:\iblscripts\deploy\project_procedure_gui\pp_requirements.txt
python C:\iblrig\scripts\add_ex_desc_gui_to_tasks.py
```
- Note: Any custom tasks will need to have this pre-task command manually configured

Within whichever custom task you would like to test this gui, simply add the following lines to `_iblrig_tasks_customTask.py`
* i.e. `C:\iblrig_params\IBL\tasks\_iblrig_tasks_customTask\_iblrig_tasks_customTask.py`

```python
from iblrig.misc import call_exp_desc_gui
call_exp_desc_gui()
```

---
## How to develop on this repository
Expand Down Expand Up @@ -94,3 +102,37 @@ Please review these conventions to more easily contribute to the project.
- a `hotfix` or `maintenance` branch is forked from `master`
- once the fix has been thoroughly tested, it will get merged back into `master` and `develop`
- the `hotfix` branch will eventually be deleted

---

### Troubleshooting Notes

#### Windows
Disable Microsoft Store associations with `python` command
* Open the Settings or Start menu and search for “App execution aliases” or “Manage app execution aliases”
* Disable any python entries listed

#### Anaconda
##### Broken Uninstall
* After uninstalling, navigate the file browser to the user home directory (C:\Users\username) and remove all `Anaconda`,
`.anaconda`, `.conda`, `.condarc`, etc files and folders
* search the hidden AppData folders as well (different versions of Anaconda stored data in different locations)
* If running the command prompt is no longer functional, run the following command in Powershell:
> Reg Delete "HKCU\Software\Microsoft\Command Processor" /v AutoRun /f
* If Powershell is throwing a warning about an `Activate.ps1` file, remove the profile file from `%userhome%\Documents\Powershell`

##### llvmlite error on ibllib install
While performing a `pip install ibllib` command in a fresh conda environment, an occasional error may occur; `Error: Cannot
uninstall llvmlite...`. A simple workaround:
* close all Anaconda Prompts
* open an **Anaconda Powershell Prompt**
* reactivate the ibllib conda environment, `conda activate ibllib`
* run `pip install ibllib`

### Stim display on wrong screen
If the visual stimulus appears on the wrong screen:
* short term, pressing `F11` on the keyboard will unmaximize the window; allowing movement of the stimulus to the correct screen
* longer term, take note of a file called `C:\iblrig_params\.iblrig_params.json`; within that file is a variable called
`DISPLAY_IDX`, its value will be set to 0 or 1. If the stimulus screen initially launches on the wrong monitor (PC screen instead
of iPad screen), then change the value of `DISPLAY_IDX`. Change it to 0 if it was on 1, change it to 1 if it was on 0.
* Please note, the display index value is something assigned by OS and could potentially change between reboots
2 changes: 1 addition & 1 deletion iblrig/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "7.0.3"
__version__ = "7.0.4"
import logging

import colorlog
Expand Down
Loading

0 comments on commit 30b77f9

Please sign in to comment.