Dev1_0 branch ready for merging into master?

[emiliom]

@sreeder, is the Dev1_0 ready for merging into master? Or are you planning to do more testing? Would be great to have it merged by the end of the week. We can then issue a new odm2api release and update the conda package. Thanks!

[emiliom]

With PR #51 now merged into Dev1_0 (thanks!!), is Dev1_0 ready for merging into master?

Before or after that merge we could also move forward with #38 by removing the ODM1_1_1 stuff, now that @sreeder has preserved it in the odm1dev branch.

[sreeder]

@emiliom I am working on merging Dev1_0 now, but it will break all of the testing stuff so I am pulling the code from master into my branch, fixing the tests, then merging it back into master.

[emiliom]

Got it, thanks.

[sreeder]

@emiliom I have started removing ODM1 in the removeODM1 Branch. I still have some things to fix but should be able to get that done by Monday as well.

[emiliom]

@sreeder, that's great! I'm really looking forward to this.

[emiliom]

Merged. Closing.