Skip to content

Commit de45a33

Browse files
committed
move to src/ based package structure
1 parent abfaa19 commit de45a33

File tree

13 files changed

+16
-19
lines changed

13 files changed

+16
-19
lines changed

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,6 @@ requires = ["uv_build>=0.9.14,<0.10.0"]
3333
build-backend = "uv_build"
3434

3535
[tool.uv.build-backend]
36-
module-root = "./"
37-
data = ["omark/assets"]
36+
module-root = "./src"
37+
data = ["src/omark/assets"]
38+
File renamed without changes.
File renamed without changes.

omark/files.py renamed to src/omark/files.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import re
1818
import jinja2
1919
import os
20-
from omark.utils import LOG
20+
from .utils import LOG
2121

2222
#This function is called to make sure the input file correspond to OMArk assumption.
2323
#It return a boolean consisting of whether an errror was detected and print the reason for
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from omamer.hierarchy import get_descendants, get_leaves, get_root_leaf_offsets, get_children
1818
from tables.exceptions import HDF5ExtError
1919
import omamer.database
20-
from omark.utils import LOG
20+
from .utils import LOG
2121
import numpy as np
2222
import tqdm
2323

omark/omark.py renamed to src/omark/omark.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,16 @@
1515
'''
1616

1717
import os
18-
import omark.files as io
19-
import omark.species_determination as spd
20-
import omark.omamer_utils as outils
21-
import omark.scoring as sc
22-
import omark.graphics as graph
23-
from omark.utils import LOG, set_log_level
2418
import sys
25-
26-
def get_omamer_qscore(omamerfile, dbpath, stordir, taxid=None, contamination= True, original_FASTA_file = None, force = True, isoform_file = None, min_n_species=5, taxonomic_rank= None, extract_conserved_only=True):
19+
from . import files as io
20+
from . import species_determination as spd
21+
from . import omamer_utils as outils
22+
from . import scoring as sc
23+
from . import graphics as graph
24+
from .utils import LOG, set_log_level
2725

2826

29-
30-
27+
def get_omamer_qscore(omamerfile, dbpath, stordir, taxid=None, contamination= True, original_FASTA_file = None, force = True, isoform_file = None, min_n_species=5, taxonomic_rank= None, extract_conserved_only=True):
3128
allres = dict()
3229

3330
basefile = '.'.join(omamerfile.split('/')[-1].split('.')[:-1])

0 commit comments

Comments
 (0)