Skip to content

Commit 358b674

Browse files
authored
Fix bug with pytaxonkit.name (#26)
* Fix bug with pytaxonkit.name * Add regression test
1 parent d24a1a5 commit 358b674

3 files changed

Lines changed: 33 additions & 8 deletions

File tree

.github/workflows/cibuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
run: |
3737
mkdir ~/.taxonkit
3838
pushd ~/.taxonkit
39-
wget ftp://ftp.ncbi.nih.gov/pub/taxonomy/taxdump.tar.gz
39+
curl -L -O ftp://ftp.ncbi.nih.gov/pub/taxonomy/taxdump.tar.gz
4040
tar -xzf taxdump.tar.gz
4141
popd
4242
- name: Install

pytaxonkit.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,8 @@ def name(ids, data_dir=None, debug=False):
436436
1 2216222 Paramyia sp. BIOUG21706-A10
437437
2 517824 soil bacterium Cipr-S1N-M1LLLSSL-1
438438
'''
439-
idlist = '\n'.join(map(str, ids))
440-
if idlist == '':
439+
idlist = '\n'.join(map(str, ids)) + '\n'
440+
if idlist == '\n':
441441
warn('No input for pytaxonkit.name', UserWarning)
442442
return
443443
arglist = ['taxonkit', 'lineage', '--show-name', '--no-lineage']
@@ -559,6 +559,13 @@ def test_name_debug(capsys):
559559
assert 'taxonkit lineage --show-name --no-lineage' in err
560560

561561

562+
def test_name_regression():
563+
result = name([6])
564+
print(result)
565+
assert len(result) == 1
566+
assert result.Name[0] == 'Azorhizobium'
567+
568+
562569
def test_lineage_empty():
563570
with pytest.warns(UserWarning, match="No input for pytaxonkit.lineage"):
564571
result = lineage([])

sweetleaf.json

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"239694 [species] Symplocos cochinchinensis": {
1919
"251585 [varietas] Symplocos cochinchinensis var. laurina": {},
2020
"1118787 [varietas] Symplocos cochinchinensis var. glaberrima": {},
21-
"1312847 [varietas] Symplocos cochinchinensis var. pilosiuscula": {}
21+
"1312847 [varietas] Symplocos cochinchinensis var. pilosiuscula": {},
22+
"2900625 [varietas] Symplocos cochinchinensis var. cochinchinensis": {}
2223
},
2324
"239695 [species] Symplocos coreana": {},
2425
"239696 [species] Symplocos ernestii": {},
@@ -30,17 +31,23 @@
3031
"239702 [species] Symplocos konishii": {},
3132
"239703 [species] Symplocos kuroki": {},
3233
"239704 [species] Symplocos lancifolia": {},
33-
"239705 [species] Symplocos liukiuensis": {},
34+
"239705 [species] Symplocos liukiuensis": {
35+
"2918423 [varietas] Symplocos liukiuensis var. iriomotensis": {}
36+
},
3437
"239706 [species] Symplocos modesta": {},
35-
"239707 [species] Symplocos myrtacea": {},
38+
"239707 [species] Symplocos myrtacea": {
39+
"2900626 [varietas] Symplocos myrtacea var. myrtacea": {}
40+
},
3641
"239708 [species] Symplocos nakaharae": {},
3742
"239709 [species] Symplocos okinawensis": {},
3843
"239710 [species] Symplocos pergracilis": {},
3944
"239711 [species] Symplocos prunifolia": {
4045
"239712 [varietas] Symplocos prunifolia var. prunifolia": {},
4146
"239713 [varietas] Symplocos prunifolia var. tawadae": {}
4247
},
43-
"239714 [species] Symplocos sawafutagi": {},
48+
"239714 [species] Symplocos sawafutagi": {
49+
"2900627 [varietas] Symplocos sawafutagi var. sawafutagi": {}
50+
},
4451
"239715 [species] Symplocos sonoharae": {},
4552
"239716 [species] Symplocos stellaris": {
4653
"251559 [varietas] Symplocos stellaris var. aenea": {}
@@ -221,7 +228,18 @@
221228
"2662168 [species] Symplocos guianensis": {},
222229
"2687301 [species] Symplocos cambodiana": {},
223230
"2687304 [species] Symplocos hayatae": {},
224-
"2803345 [species] Symplocos juiyenensis": {}
231+
"2803345 [species] Symplocos juiyenensis": {},
232+
"2945196 [species] Symplocos colombonensis": {},
233+
"2945525 [species] Symplocos decora": {},
234+
"2945526 [species] Symplocos elliptica": {},
235+
"2945527 [species] Symplocos insolita": {},
236+
"2945528 [species] Symplocos molinae": {},
237+
"2945529 [species] Symplocos obovata": {},
238+
"2945530 [species] Symplocos octopetala": {},
239+
"2945531 [species] Symplocos peruviana": {},
240+
"2945532 [species] Symplocos saxatilis": {},
241+
"2945533 [species] Symplocos sulcata": {},
242+
"2945534 [species] Symplocos theifolia": {}
225243
},
226244
"1340860 [genus] Cordyloblaste": {},
227245
"2601367 [no rank] environmental samples": {

0 commit comments

Comments
 (0)