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

Reconcile mut_morphio and master a bit more #794

Merged
merged 4 commits into from
Jan 24, 2020
Merged

Reconcile mut_morphio and master a bit more #794

merged 4 commits into from
Jan 24, 2020

Conversation

wizmer
Copy link
Contributor

@wizmer wizmer commented Jan 24, 2020

Bring back some harmless changes that were done in the mut_morphio branch
in the master branch.
The goal is to decrease the differences between the two branches.

Bring back some harmless changes that we done in the mut_morphio branch
in the master branch.
The goal is to decrease the differences between the too branches.\
@@ -70,13 +71,21 @@ def test_section_area():


def test_section_tortuosity():
sec_a = Section([
Copy link
Contributor Author

Choose a reason for hiding this comment

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

NeuroM v2 won't have a Section ctor so we need to get rid of its use in the tests.

@@ -110,28 +111,31 @@ def _genetate_tree_non_monotonic_section_boundary():


def _generate_back_track_tree(n, dev):

Copy link
Contributor Author

Choose a reason for hiding this comment

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

NeuroM v2 won't have a Section ctor so we need to get rid of its use in the tests.

Copy link
Contributor

@asanin-epfl asanin-epfl left a comment

Choose a reason for hiding this comment

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

Looks super good to me. One minor thing is about imports in tests.

neurom/core/tests/test_iter.py Outdated Show resolved Hide resolved
neurom/fst/tests/test_neuronfunc.py Outdated Show resolved Hide resolved
@wizmer wizmer merged commit b839946 into BlueBrain:master Jan 24, 2020
@wizmer wizmer deleted the prepare-mut-morphio branch January 24, 2020 22:17
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