Merge branch 'master' into Eric_version_for_sequence

Conflicts:
	python/obitools3/obidms/_obidmscolumn_seq.pyx
This commit is contained in:
2016-08-03 10:09:20 +02:00
31 changed files with 1142 additions and 953 deletions

View File

@ -1,5 +1,7 @@
#cython: language_level=3
from ..utils cimport str2bytes
from .header cimport parseHeader
from ..files.universalopener cimport uopen
from ..files.linebuffer cimport LineBuffer