Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
d33ff97846 | |||
1dcdf69f1f | |||
dec114eed6 | |||
f36691053b |
@ -23,6 +23,7 @@ from obitools3.dms.capi.obiview cimport NUC_SEQUENCE_COLUMN, \
|
|||||||
import shutil
|
import shutil
|
||||||
import string
|
import string
|
||||||
import random
|
import random
|
||||||
|
import sys
|
||||||
from cpython.exc cimport PyErr_CheckSignals
|
from cpython.exc cimport PyErr_CheckSignals
|
||||||
|
|
||||||
|
|
||||||
@ -366,7 +367,7 @@ def random_new_view(config, infos, first=False):
|
|||||||
infos['view'] = View_NUC_SEQS.new(infos['dms'], random_unique_name(infos), comments=random_comments(config)) # TODO quality column
|
infos['view'] = View_NUC_SEQS.new(infos['dms'], random_unique_name(infos), comments=random_comments(config)) # TODO quality column
|
||||||
else :
|
else :
|
||||||
infos['view'] = View.new(infos['dms'], random_unique_name(infos), comments=random_comments(config)) # TODO quality column
|
infos['view'] = View.new(infos['dms'], random_unique_name(infos), comments=random_comments(config)) # TODO quality column
|
||||||
|
infos['view'].write_config(config, "test", infos["command_line"], input_dms_name=[infos['dms'].name], input_view_name=["random"])
|
||||||
print_test(config, repr(infos['view']))
|
print_test(config, repr(infos['view']))
|
||||||
if v_to_clone is not None :
|
if v_to_clone is not None :
|
||||||
if line_selection is None:
|
if line_selection is None:
|
||||||
@ -497,7 +498,8 @@ def run(config):
|
|||||||
(b"OBI_SEQ", False): random_seq, (b"OBI_SEQ", True): random_seq_tuples,
|
(b"OBI_SEQ", False): random_seq, (b"OBI_SEQ", True): random_seq_tuples,
|
||||||
(b"OBI_STR", False): random_bytes, (b"OBI_STR", True): random_bytes_tuples
|
(b"OBI_STR", False): random_bytes, (b"OBI_STR", True): random_bytes_tuples
|
||||||
},
|
},
|
||||||
'tests': [test_set_and_get, test_add_col, test_delete_col, test_col_alias, test_new_view]
|
'tests': [test_set_and_get, test_add_col, test_delete_col, test_col_alias, test_new_view],
|
||||||
|
'command_line': " ".join(sys.argv[1:])
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO ???
|
# TODO ???
|
||||||
|
@ -7,6 +7,7 @@ cdef dict __VIEW_CLASS__= {}
|
|||||||
from libc.stdlib cimport malloc
|
from libc.stdlib cimport malloc
|
||||||
|
|
||||||
from obitools3.apps.progress cimport ProgressBar # @UnresolvedImport
|
from obitools3.apps.progress cimport ProgressBar # @UnresolvedImport
|
||||||
|
from obitools3.version import version
|
||||||
|
|
||||||
from ..capi.obiview cimport Alias_column_pair_p, \
|
from ..capi.obiview cimport Alias_column_pair_p, \
|
||||||
obi_new_view, \
|
obi_new_view, \
|
||||||
@ -184,7 +185,13 @@ cdef class View(OBIWrapper) :
|
|||||||
|
|
||||||
@OBIWrapper.checkIsActive
|
@OBIWrapper.checkIsActive
|
||||||
def __repr__(self) :
|
def __repr__(self) :
|
||||||
cdef str s = "#View name:\n{name:s}\n#Line count:\n{line_count:d}\n#Columns:\n".format(name = bytes2str(self.name),
|
cdef str s
|
||||||
|
if self.read_only: # can read date
|
||||||
|
s = "#View name:\n{name:s}\n#Date created:\n{date:s}\n#Line count:\n{line_count:d}\n#Columns:\n".format(name = bytes2str(self.name),
|
||||||
|
line_count = self.line_count,
|
||||||
|
date = str(bytes2str_object(self.comments["Date created"])))
|
||||||
|
else:
|
||||||
|
s = "#View name:\n{name:s}\n#Line count:\n{line_count:d}\n#Columns:\n".format(name = bytes2str(self.name),
|
||||||
line_count = self.line_count)
|
line_count = self.line_count)
|
||||||
for column_name in self.keys() :
|
for column_name in self.keys() :
|
||||||
s = s + repr(self[column_name]) + '\n'
|
s = s + repr(self[column_name]) + '\n'
|
||||||
@ -434,6 +441,7 @@ cdef class View(OBIWrapper) :
|
|||||||
for i in range(len(input_view_name)):
|
for i in range(len(input_view_name)):
|
||||||
input_str.append(tostr(input_dms_name[i])+"/"+tostr(input_view_name[i]))
|
input_str.append(tostr(input_dms_name[i])+"/"+tostr(input_view_name[i]))
|
||||||
comments["input_str"] = input_str
|
comments["input_str"] = input_str
|
||||||
|
comments["version"] = version
|
||||||
return bytes2str_object(comments)
|
return bytes2str_object(comments)
|
||||||
|
|
||||||
|
|
||||||
|
@ -276,9 +276,9 @@ def open_uri(uri,
|
|||||||
iseq = urib
|
iseq = urib
|
||||||
objclass = bytes
|
objclass = bytes
|
||||||
else: # TODO update uopen to be able to write?
|
else: # TODO update uopen to be able to write?
|
||||||
if urip.path == b'-':
|
if not urip.path or urip.path == b'-':
|
||||||
file = sys.stdout.buffer
|
file = sys.stdout.buffer
|
||||||
elif urip.path :
|
else:
|
||||||
file = open(urip.path, 'wb')
|
file = open(urip.path, 'wb')
|
||||||
|
|
||||||
if file is not None:
|
if file is not None:
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
major = 3
|
major = 3
|
||||||
minor = 0
|
minor = 0
|
||||||
serial= '0b30'
|
serial= '0b31'
|
||||||
|
|
||||||
version ="%d.%d.%s" % (major,minor,serial)
|
version ="%d.%d.%s" % (major,minor,serial)
|
||||||
|
Reference in New Issue
Block a user