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

Chang to merge #76

Merged
merged 56 commits into from
Apr 28, 2020
Merged

Chang to merge #76

merged 56 commits into from
Apr 28, 2020

Conversation

bendichter
Copy link
Contributor

@luiztauffer I went through and handled all of the merge conflicts with the Chang Lab's master branch, but I wanted to run these changes by you before merging. When you have time, can you look at these and make sure that it doesn't break anything on your end?

jgmakin and others added 30 commits August 22, 2019 10:37
-bug fixes
-numerous changes for PEP compliance
…tes that break the code at the current moment
jessierliu and others added 9 commits November 8, 2019 17:58
…numpy object, this needed to be changed with update of pynwb to 1.1.2
fix definitions in electrode table to be strings and not any sort of …
# Conflicts:
#	README.md
#	ecogvis/functions/misc_dialogs.py
#	ecogvis/functions/nwb_copy_file.py
#	ecogvis/functions/subFunctions.py
#	ecogvis/signal_processing/detect_events.py
#	ecogvis/signal_processing/processing_data.py
#	ecogvis/signal_processing/resample_clone.py
#	setup.py
@bendichter
Copy link
Contributor Author

It looks like there were some issues merging these together. I'll look into these.

Copy link
Member

@luiztauffer luiztauffer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see weird line breaks in many places, feel like an editor bug from someone

ecogvis/functions/misc_dialogs.py Outdated Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Outdated Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Outdated Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Outdated Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Outdated Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Show resolved Hide resolved
ecogvis/functions/misc_dialogs.py Show resolved Hide resolved
@luiztauffer
Copy link
Member

luiztauffer commented Apr 16, 2020

I wouldn't merge it now. I ran it and has some weird bugs in some elements.

Update
What I thought was a bug was actually a new rectangles plotting on top panel that they created o their repo. It is ok, is just a new function.

@luiztauffer
Copy link
Member

luiztauffer commented Apr 16, 2020

Maybe everyone should check if this version is working as expected for their current workflows? Before merging to the master
@bendichter
@jgmakin
@jrliu95
@emilyps14
@Armin12

A reference for testing the PR locally:
https://dev.to/bolajiayodeji/how-to-test-a-pull-request-locally-before-merging-1h29

most important part, on your local repo directory:
$ git fetch origin pull/76/head
$ git checkout FETCH_HEAD

@emilyps14
Copy link
Contributor

emilyps14 commented Apr 16, 2020

This seems trivial but it's my workflow to run ecogVIS from inside a python console in PyCharm as:
from ecogvis.ecogvis import main; main(<path to file>)

This now breaks, because of the ArgumentParser usage within main(). My plan is to move the offending code to the if __name__ == '__main__': clause, since that will only run when ecogvis is called from the command line.

Objections?

EDIT: I now realize this is a problem with master, not the PR. I will try to work around it for now.

@bendichter
Copy link
Contributor Author

It looks like some issues came up in the merge beyond weird formatting. I think this is going to few days to sort out. We'll be in touch when it's ready to test.

@luiztauffer
Copy link
Member

luiztauffer commented Apr 17, 2020

I fixed some test errors and most are passing now.
But there are specifically two that are still failing:
/signal_processing/test_detect_events.py

<40> np.testing.assert_array_almost_equal(speakerEventDS, speakerEventDS_expected)
<42> np.testing.assert_array_almost_equal(micEventDS, micEventDS_expected)

@bendichter
Copy link
Contributor Author

@luiztauffer Thanks. Yes, I suspect there have been some changes to the event detection function that will break numerical equivalence. As long as the new results are reasonable we can just replace the array they are being compared to. I'd like to strictly adhere to the tests passing before merge so that we can continue to rely in CI to catch our mistakes. I'll take a look and see if I can repair the tests.

- add example mic and speaker data for test
@codecov
Copy link

codecov bot commented Apr 28, 2020

Codecov Report

Merging #76 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #76   +/-   ##
=======================================
  Coverage   19.59%   19.59%           
=======================================
  Files          23       23           
  Lines        4949     4949           
=======================================
  Hits          970      970           
  Misses       3979     3979           
Flag Coverage Δ
#unittests 19.59% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4de089b...4de089b. Read the comment docs.

@luiztauffer
Copy link
Member

@bendichter
I fixed the event detection tests. The test data (a numpy array) didn’t make sense to me, so I’ve added some fake recording for mic and speaker (wav files), now the tests are passing just fine.

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.

5 participants