Skip to content
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.

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

Update from Dev #338

Merged
merged 141 commits into from
Aug 16, 2022
Merged

Update from Dev #338

merged 141 commits into from
Aug 16, 2022

Conversation

tensionhead
Copy link
Contributor

No description provided.

kajal5888 and others added 30 commits April 27, 2022 11:52
	new file:   load_tdt.py
Testing
 with '#' will be ignored, and an empty message aborts the commit.
Changes to be committed:
	modified:   CITATION.cff
	modified:   setup.py
Changes to be committed:
	modified:   CITATION.cff
Changes to be committed:
	new file:   syncopy/tests/test_tdt.py
- it's now under /cs/slurm/syncopy/Tdt_reader
Changes to be committed:
	modified:   syncopy/tests/test_tdt.py
Changes to be committed:
	modified:   syncopy/io/load_tdt.py
	modified:   syncopy/tests/test_tdt.py
- wraps around the classes from @kajal5888
- TODO: sort out hdf5 layout

On branch tdt-reader
Your branch is ahead of 'origin/tdt-reader' by 1 commit.
  (use "git push" to publish your local commits)

Changes to be committed:
	modified:   syncopy/io/load_tdt.py
	modified:   syncopy/tests/test_tdt.py
tensionhead and others added 29 commits August 10, 2022 16:11
- removed tox completely
- updated changelog
- relaxed test_filename test

On branch dev
Your branch is up to date with 'origin/dev'.

Changes to be committed:
	modified:   .gitlab-ci.yml
	modified:   CHANGELOG.md
	modified:   poetry.lock
	modified:   pyproject.toml
	modified:   syncopy.yml
	modified:   syncopy/tests/test_basedata.py
	deleted:    tox.ini
Changes to be committed:
	modified:   .gitlab-ci.yml
gitlab variables also get referenced via '$' for windows runners..
Changes to be committed:
	modified:   pyproject.toml
- there might still be some float precision edge cases lurking somewhere..

Changes to be committed:
	modified:   syncopy/preproc/compRoutines.py
	modified:   syncopy/tests/test_resampledata.py
…rors-for-resampling

FIX: Construct trialdefinition of resampled data
@tensionhead tensionhead merged commit af44b7f into psth Aug 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants