Skip to content

2024 data collection updates #6

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

Jump to bottom
Merged
merged 136 commits into from
Nov 13, 2024
Merged

2024 data collection updates #6

merged 136 commits into from
Nov 13, 2024

Conversation

@Shotgunosine
Copy link
Collaborator

@Shotgunosine Shotgunosine commented Nov 13, 2024

No description provided.

dyld-w and others added 30 commits September 28, 2024 23:49
@dyld-w
Comments out previous server setup
05b58c3
@dyld-w
Updates to latest SMILE
b398e82
@dyld-w
Adds versioning + SubjectID to the Windows exe packaging
d45724b
@dyld-w
Adds SubjectID reading from exe & a Label to display it
c45afbb
@dyld-w
Refactors for pep8 compliance
26d6298
@dyld-w
Removes 'inscructions' directory w/ duplicate contents as 'instructions'
23e1fb8
@dyld-w
Fixes expected types
cc33f2d
@dyld-w
Adds edit_exe_subject_id utility function
47537db
@dyld-w
Updates SubjectID field length to 54 char
6f0a4e6
@dyld-w
Changes exe file name
93d09c1
@dyld-w
RF: Edits Mac specfile to bundle to app
e475767
@dyld-w
RF NF: Renames to backend_executables_utils & adds macOS SubjectID ed…
0d225bb 
…iting function
@dyld-w
Unignores .spec files
e3998d6
@dyld-w
Renames spec files
f8b9bce
@dyld-w
Adds Makefile for packaging
f057e79
@dyld-w
Adds UPX for Windows; UPX not compatible with MacOS 13+
c8d0ae7
@dyld-w
Revert "Adds UPX for Windows; UPX not compatible with MacOS 13+"
7decd87 
This reverts commit c8d0ae7.
@dyld-w
Ignores .DS_Store
90a844b
@dyld-w
Adds UPX for Windows; UPX not supported on MacOS 13+
74c4507
@dyld-w
Imports pefile & fixes formatting
3d0b89d
@dyld-w
Adds util functions for reading SubjectID from within executables
37e6988
@dyld-w
Adds OS detection to config & SubjectID retrieval to main
94d8864
@dyld-w
Fixes path handling within the bundle and adds custom exception when …
fca9d47 
…not run within bundle
@libbywoodson
Add files via upload
5c3a247
@libbywoodson
Add files via upload
b7d0147
@libbywoodson
Add files via upload
8e991c4
@libbywoodson
Add files via upload
8236bd8
@libbywoodson
Create ex.py
43397d7
@libbywoodson
Add files via upload
0e32e71
@dyld-w
Switches from SubjectID to WorkerID
86461ab
Shotgunosine and others added 29 commits November 6, 2024 14:17
@Shotgunosine
fix specfile name
90c3a84
@Shotgunosine
fix specfile name
9978461
@Shotgunosine
revert mac to dw code
8b10137
@Shotgunosine
revert mac to dw code
b928c40
@Shotgunosine
debug mac version
fde835e
@Shotgunosine
explicitly set python path
693b1be
@Shotgunosine
debug mac build
90ce0cd
@Shotgunosine
pin pyinstaller version till they fix an icon bug
8c53bd1
@Shotgunosine
fix pip install
62ddc22
@Shotgunosine
PTYHON_PATH -> PYTHONPATH
82ddf51
@Shotgunosine
don't run tmate by default
c54bc9d
@libbywoodson
Delete tasks/flanker/stim/fish_left.png
0411309 
Changing fish image
@libbywoodson
Delete tasks/flanker/stim/fish_right.png
21364eb 
Changing fish image
@libbywoodson
Add files via upload
2edc262 
Updated fish files
@libbywoodson
Add files via upload
f7ff38a
@libbywoodson
Add files via upload
ce52d17
@libbywoodson
Add files via upload
c735e9e
@libbywoodson
Create stim.zip
6a1edb8
@libbywoodson
Update list_gen.py
e4a26c8 
Updated colors to match previous task
@libbywoodson
Add files via upload
d237cc5 
Updated colors of balloons
@libbywoodson
Update main.py
9ff6001 
Made happymid false
@dyld-w
Merge branch '2024-task-graphic-updates' into 2024-data-collection-up…
ec26156 
…dates
@dyld-w
Adds updates to isntruct.py from instruct-copy & re-deletes instruct-…
ca8b2dd 
…copy
@dyld-w
Fixes background during practice
9fd4a15
@dyld-w
Removes unused image
272a2a1
@dyld-w
Updates README install instructions for Makefile
a74a156
@Shotgunosine
add fixation cross to practice
8bbc775
@Shotgunosine
update action to run on master
bdbc1c7
@Shotgunosine
clean up actions
73db4d6
@Shotgunosine Shotgunosine merged commit bf9c19f into master Nov 13, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Shotgunosine @dyld-w @libbywoodson