Skip to content

Commit

Permalink
Compensatory changes for latest khmer
Browse files Browse the repository at this point in the history
  • Loading branch information
standage committed Jun 2, 2017
1 parent 9cb11e8 commit a0a80ca
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
8 changes: 5 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
SHELL=bash

devenv:
pip install --upgrade pip setuptools pytest pytest-cov pep8 cython sphinx

Expand All @@ -14,9 +16,9 @@ doc:
cd docs && make html

loc:
@- echo "\n\n===== Core kevlar ====="
@- echo -e "\n\n===== Core kevlar ====="
cloc --exclude-list-file=.cloc.exclude kevlar/*.py
@- echo "\n\n===== kevlar CLI ====="
@- echo -e "\n\n===== kevlar CLI ====="
cloc kevlar/cli/*.py
@- echo "\n\n===== kevlar tests ====="
@- echo -e "\n\n===== kevlar tests ====="
cloc kevlar/tests/test_*.py
2 changes: 1 addition & 1 deletion kevlar/sketch.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def autoload(infile, count=True, graph=False, ksize=31, table_size=1e4,
sketch = allocate(ksize, table_size, num_tables, count=count,
graph=graph, smallcount=False)
if num_bands:
assert band > 0 and band <= num_bands
assert band >= 0 and band < num_bands
sketch.consume_seqfile_banding(infile, num_bands, band)
else:
sketch.consume_seqfile(infile)
Expand Down
2 changes: 1 addition & 1 deletion kevlar/tests/test_sketch.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ def test_autoload():

sketch3 = kevlar.sketch.autoload(infile, ksize=25, table_size=1e7,
count=True, graph=True, num_bands=4,
band=3)
band=0)
assert sketch3.get('CAGCTGACCCACCGACACATAGGTT') > 0
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
networkx
-e git+https://github.com/dib-lab/khmer.git@feature/consume_bitsplit#egg=khmer
git+https://github.com/dib-lab/khmer.git

0 comments on commit a0a80ca

Please sign in to comment.