Merging Kirsten's streaming plot features

ContextLab / hypertools

A Python toolbox for gaining geometric insights into high-dimensional data

http://hypertools.readthedocs.io/en/latest/

MIT License

1.83k stars 160 forks source link

Merging Kirsten's streaming plot features #11

Closed andrewheusser closed 7 years ago

jeremymanning commented 7 years ago

looks like there are some conflicts to be resolved before the pull can go through. thoughts:

the .pyc files should be removed (they shouldn't be part of the repository anyway)
for the other files, we'll need to do a line-by-line conflict resolution. @andrewheusser or @KirstensGitHub, can one of you take that on? (it may be as simple as accepting the new version over the old one, or it could be tricky if both versions have been modified since the last pull.)

andrewheusser commented 7 years ago

my vote would be to hold off on this PR until we get the streaming features working seamlessly, and then merge. @jeremymanning @KirstensGitHub if you guys agree, I'll close this PR and kirsten and I can hash out streaming and then create a new PR when its ready

jeremymanning commented 7 years ago

plan approved. :+1: