Celine Mercier 431c1c8c6a Merge branch 'Eric_new_Python_API' of ...

git@git.metabarcoding.org:obitools/obitools3.git into
Eric_new_Python_API

Conflicts:
	python/obitools3/obidms/_obidms.pxd
	python/obitools3/obidms/_obidms.pyx
	python/obitools3/obidms/_obidmscolumn_bool.pyx
	python/obitools3/obidms/_obidmscolumn_str.pyx
	python/obitools3/obidms/_obiseq.pxd
	python/obitools3/obidms/_obiseq.pyx
	python/obitools3/obidms/_obitaxo.pxd
	python/obitools3/obidms/_obitaxo.pyx
	python/obitools3/obidms/_obiview.pxd
	python/obitools3/obidms/_obiview.pyx
	python/obitools3/obidms/_obiview_nuc_seq.pxd
	python/obitools3/obidms/_obiview_nuc_seq.pyx
	python/obitools3/obidms/_obiview_nuc_seq_qual.pxd
	python/obitools3/obidms/_obiview_nuc_seq_qual.pyx
	python/obitools3/obidms/capi/obialign.pxd
	python/obitools3/obidms/capi/obidmscolumn.pxd
	python/obitools3/obidms/capi/obitaxonomy.pxd
	python/obitools3/obidms/capi/obiview.pxd

2017-02-20 14:55:36 +01:00

..

apps

Should solde issue #56

2016-09-19 21:40:40 +02:00

commands

Merge branch 'Eric_new_Python_API' of

2017-02-20 14:55:36 +01:00

dms

Merge branch 'Eric_new_Python_API' of

2017-02-20 14:55:36 +01:00

files

remove an extra debug log

2016-05-21 12:29:08 +02:00

format

Added OBIView_line_selection class to make new line selections

2016-09-30 17:48:53 +02:00

obidms

New Cython API: compile but doesn't work

2017-02-17 15:14:06 +01:00

parsers

first working DMS class

2016-12-27 06:17:45 +01:00

__init__.py

first skeleton of the obitools3 package

2015-05-26 10:38:15 +02:00

__init__.pyc

Merge branch 'Eric_new_Python_API' of

2017-02-20 14:55:36 +01:00

utils.pxd

Strong refactoring 1

2016-12-26 13:35:31 +01:00

utils.pyx

first working DMS class

2016-12-27 06:17:45 +01:00

version.py

changed version to 0.0.0

2015-11-19 18:11:21 +01:00

version.pyc

Merge branch 'Eric_new_Python_API' of

2017-02-20 14:55:36 +01:00