Skip to content

Commit da93195

Browse files
committed
Updates to fix additional name dependencies
1 parent 64f95a3 commit da93195

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

gff3tool/lib/gff3_merge/auto_replace_tag.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ def main(gff1, gff2, fasta, outdir, scode, logger, all_assign=False, user_define
112112
out1 = os.path.join(tmpdir, 'gff1')
113113
if user_defined1 is None:
114114
logger.info('\tExtract CDS sequences...')
115-
gff3_to_fasta.main(gff_file=gff1, fasta_file=fasta, stype='cds', dline='complete', qc=False, output_prefix=out1, logger=logger_null)
115+
gff3_to_fasta.main(gff_file=gff1, fasta_file=fasta, stype='cds', dline='simple', qc=False, output_prefix=out1, logger=logger_null)
116116
logger.info('\tExtract premature transcript sequences...')
117-
gff3_to_fasta.main(gff_file=gff1, fasta_file=fasta, stype='pre_trans', dline='complete', qc=False, output_prefix=out1, logger=logger_null)
117+
gff3_to_fasta.main(gff_file=gff1, fasta_file=fasta, stype='pre_trans', dline='simple', qc=False, output_prefix=out1, logger=logger_null)
118118
if len(transcripts) > 0:
119119
logger.info('\tExtract transcript sequences...')
120-
gff3_to_fasta.main(gff_file=gff1, fasta_file=fasta, stype='trans', dline='complete', qc=False, output_prefix=out1, logger=logger_null)
120+
gff3_to_fasta.main(gff_file=gff1, fasta_file=fasta, stype='trans', dline='simple', qc=False, output_prefix=out1, logger=logger_null)
121121
else:
122122
logger.info('\tExtract user_defined_file1 sequences...')
123123
user_defined_out1 = '{0:s}_{1:s}'.format(out1, 'cds.fa')
@@ -126,7 +126,7 @@ def main(gff1, gff2, fasta, outdir, scode, logger, all_assign=False, user_define
126126
parent_type = set()
127127
with open(user_defined_out1, "w") as outfile:
128128
for lines in user_defined1:
129-
gff3_to_fasta.main(gff_file=gff1, fasta_file=fasta, stype='user_defined', user_defined=lines, dline='complete', qc=False, output_prefix=out1, logger=logger_null)
129+
gff3_to_fasta.main(gff_file=gff1, fasta_file=fasta, stype='user_defined', user_defined=lines, dline='simple', qc=False, output_prefix=out1, logger=logger_null)
130130
with open(user_defined_tmp, 'r') as fd:
131131
shutil.copyfileobj(fd, outfile)
132132
parent_type.add(lines[0])
@@ -144,12 +144,12 @@ def main(gff1, gff2, fasta, outdir, scode, logger, all_assign=False, user_define
144144
out2 = os.path.join(tmpdir, 'gff2')
145145
if user_defined2 is None:
146146
logger.info('\tExtract CDS sequences...')
147-
gff3_to_fasta.main(gff_file=gff2, fasta_file=fasta, stype='cds', dline='complete', qc=False, output_prefix=out2, logger=logger_null)
147+
gff3_to_fasta.main(gff_file=gff2, fasta_file=fasta, stype='cds', dline='simple', qc=False, output_prefix=out2, logger=logger_null)
148148
logger.info('\tExtract premature transcript sequences...')
149-
gff3_to_fasta.main(gff_file=gff2, fasta_file=fasta, stype='pre_trans', dline='complete', qc=False, output_prefix=out2, logger=logger_null)
149+
gff3_to_fasta.main(gff_file=gff2, fasta_file=fasta, stype='pre_trans', dline='simple', qc=False, output_prefix=out2, logger=logger_null)
150150
if len(transcripts) > 0:
151151
logger.info('\tExtract transcript sequences...')
152-
gff3_to_fasta.main(gff_file=gff2, fasta_file=fasta, stype='trans', dline='complete', qc=False, output_prefix=out2, logger=logger_null)
152+
gff3_to_fasta.main(gff_file=gff2, fasta_file=fasta, stype='trans', dline='simple', qc=False, output_prefix=out2, logger=logger_null)
153153
else:
154154
logger.info('\tExtract user_defined_file2 sequences...')
155155
user_defined_out2 = '{0:s}_{1:s}'.format(out2, 'cds.fa')
@@ -158,7 +158,7 @@ def main(gff1, gff2, fasta, outdir, scode, logger, all_assign=False, user_define
158158
parent_type = set()
159159
with open(user_defined_out2, "w") as outfile:
160160
for lines in user_defined2:
161-
gff3_to_fasta.main(gff_file=gff2, fasta_file=fasta, stype='user_defined', user_defined=lines, dline='complete', qc=False, output_prefix=out2, logger=logger_null)
161+
gff3_to_fasta.main(gff_file=gff2, fasta_file=fasta, stype='user_defined', user_defined=lines, dline='simple', qc=False, output_prefix=out2, logger=logger_null)
162162
with open(user_defined_tmp, 'r') as fd:
163163
shutil.copyfileobj(fd, outfile)
164164
parent_type.add(lines[0])

gff3tool/lib/replace_OGS.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,11 @@ def name2id(self, Mgff, user_defined2=None):
480480
# roots = [line for line in Mgff.lines if line['line_type'] == 'feature' and 'Parent' not in line['attributes']]
481481
mapName2ID = {}
482482
tmp = re.search('(.+?)(\d+)',roots[0]['attributes']['ID'])
483-
idprefix = tmp.groups()[0]
483+
idprefix = 'tmpprefix'
484+
try:
485+
idprefix = tmp.groups()[0]
486+
except:
487+
pass
484488
maxIDnumber = 0
485489
digitlen = 0
486490
id2name={}

0 commit comments

Comments
 (0)