Skip to content

Commit 14f4be4

Browse files
Merge pull request #252 from jeromekelleher/tidy-ups2
Tidy ups2
2 parents 0056a19 + 841c377 commit 14f4be4

File tree

4 files changed

+11
-642
lines changed

4 files changed

+11
-642
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
3434
- name: Run tests
3535
run: |
36-
pytest --cov=sc2ts
36+
python -m pytest --cov=sc2ts tests/
3737
# - name: Upload coverage to Coveralls
3838
# uses: coverallsapp/[email protected]
3939
# with:
@@ -64,27 +64,26 @@ jobs:
6464
6565
- name: Import alignments
6666
run: |
67-
python3 -m sc2ts import-alignments testrun/alignments.db \
68-
testrun/data/alignments.fasta
69-
python3 -m sc2ts info-alignments testrun/alignments.db
67+
sc2ts import-alignments testrun/alignments.db testrun/data/alignments.fasta
68+
sc2ts info-alignments testrun/alignments.db
7069
7170
- name: Import metadata
7271
run: |
73-
python3 -m sc2ts import-metadata testrun/data/metadata.tsv testrun/metadata.db
74-
python3 -m sc2ts info-metadata testrun/metadata.db
72+
sc2ts import-metadata testrun/data/metadata.tsv testrun/metadata.db
73+
sc2ts info-metadata testrun/metadata.db
7574
7675
- name: Run inference
7776
run: |
78-
python3 -m sc2ts daily-extend -v testrun/alignments.db testrun/metadata.db \
77+
sc2ts daily-extend -v testrun/alignments.db testrun/metadata.db \
7978
testrun/ --min-group-size=2
8079
8180
- name: Validate
8281
run: |
83-
python3 -m sc2ts validate -v testrun/alignments.db testrun/2020-02-13.ts
82+
sc2ts validate -v testrun/alignments.db testrun/2020-02-13.ts
8483
8584
- name: MatchDB
8685
run: |
87-
python3 -m sc2ts info-matches testrun/match.db
86+
sc2ts info-matches testrun/match.db
8887
8988
packaging:
9089
name: Packaging tests

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ dependencies = [
2121
]
2222
dynamic = ["version"]
2323

24+
[project.scripts]
25+
sc2ts = "sc2ts.cli:cli"
26+
2427
[project.optional-dependencies]
2528
dev = [
2629
"msprime",

sc2ts/__init__.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,3 @@
66
from . alignments import *
77
from . metadata import *
88
from . inference import *
9-
# from . utils import *
10-
from . nextstrain import *
11-

0 commit comments

Comments
 (0)