Backport AxographRawIO into 0.7.x maintenance branch by jpgill86 · Pull Request #682 · NeuralEnsemble/python-neo · GitHub
Skip to content

Backport AxographRawIO into 0.7.x maintenance branch#682

Merged
apdavison merged 24 commits into
NeuralEnsemble:0.7.xfrom
jpgill86:axographrawio-backport
Jul 4, 2019
Merged

Backport AxographRawIO into 0.7.x maintenance branch#682
apdavison merged 24 commits into
NeuralEnsemble:0.7.xfrom
jpgill86:axographrawio-backport

Conversation

@jpgill86

@jpgill86 jpgill86 commented Jul 3, 2019

Copy link
Copy Markdown
Contributor

See discussion in #670.

@jpgill86 jpgill86 changed the title Backport AxographRawIO into 0.7.x maintenaince branch Backport AxographRawIO into 0.7.x maintenance branch Jul 3, 2019
@jpgill86

jpgill86 commented Jul 3, 2019

Copy link
Copy Markdown
Contributor Author

@jpgill86

jpgill86 commented Jul 4, 2019

Copy link
Copy Markdown
Contributor Author

I don't know why the Travis test result still shows "Pending" when it passed over 10 hours ago!

As I feared, the CircleCI tests failed, just as they did before I created this PR.

Sigh... 😢

@apdavison

Copy link
Copy Markdown
Member

There were a few fixes due to new versions of numpy, matplotlib, etc. after the 0.7.1 release.

e.g. [c0107d4] and [89c2210]

I don't have time to apply those to the 0.7.x branch right now - @jpgill86 could you make a new PR to get the tests passing for 0.7.x?

@jpgill86

jpgill86 commented Jul 4, 2019

Copy link
Copy Markdown
Contributor Author

Thanks @apdavison for the pointers, I'll try it!

@jpgill86

jpgill86 commented Jul 4, 2019

Copy link
Copy Markdown
Contributor Author

#683 passed the tests. After it is merged, I'll rebase this PR onto it.

jpgill86 added 24 commits July 4, 2019 14:50
Dependency on axographio package eliminated! Still missing multi-segment support, and there are new metadata available from AxoGraph files (events, epochs) that should be made accessible to Neo. Also need lots and lots of tests.
If read times are fast enough (especially in Python 2, perhaps because of a lower precision performance counter?), division by zero can happen when calculating speed in `benchmark_speed_read_signals `. This commit catches this problem.
@jpgill86 jpgill86 force-pushed the axographrawio-backport branch from 44095d1 to ad61c98 Compare July 4, 2019 18:50
@jpgill86

jpgill86 commented Jul 4, 2019

Copy link
Copy Markdown
Contributor Author

Ready to merge!

@apdavison apdavison merged commit 9a6d884 into NeuralEnsemble:0.7.x Jul 4, 2019
@apdavison apdavison added this to the 0.7.2 milestone Jul 4, 2019
@jpgill86 jpgill86 deleted the axographrawio-backport branch July 4, 2019 22:29
@jpgill86

jpgill86 commented Jul 4, 2019

Copy link
Copy Markdown
Contributor Author

@jpgill86 jpgill86 mentioned this pull request Jul 9, 2019
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.

2 participants