Skip to content

Commit

Permalink
doctests break how pysam-0.9.0 handles redirection of stdout
Browse files Browse the repository at this point in the history
  • Loading branch information
dpryan79 committed Mar 7, 2016
1 parent 1fae5c6 commit e7615d5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ install:
# command to run tests
script:
- flake8 . --exclude=.venv,.build,foo --ignore=E501,F403,E402
- nosetests --with-doctest --ignore-files=plotCoverage deeptools
- nosetests --with-doctest --ignore-files=plotCoverage --exclude=deeptools.correctGCBias deeptools
- nosetests deeptools/test/test_plotCoverage.py
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH=`echo $PATH | sed -e 's/\/home\/travis\/miniconda\/bin://'` ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then /home/travis/build/fidelram/deepTools/foo/bin/planemo lint galaxy/wrapper/ ; fi
Expand Down
1 change: 1 addition & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* Fixed labels when hierarchical clustering is used (they were off by one previously).
* Fixed a bug wherein bamCompare couldn't work with a blacklist
* Fixed yet another change in pysam, though at least in this case is was fixing a previous problem

2.2.1

Expand Down
4 changes: 3 additions & 1 deletion deeptools/correctGCBias.py
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@ def writeCorrectedSam_worker(chrNameBam, chrNameBit, start, end,
>>> args = test.testWriteCorrectedSam()
>>> tempFile = writeCorrectedSam_worker(*args, \
... tag_but_not_change_number=True, verbose=False)
>>> from StringIO import StringIO
>>> idx = pysam.index(tempFile)
>>> bam = pysam.Samfile(tempFile)
>>> [dict(r.tags)['YN'] for r in bam.fetch(args[0], 200, 250)]
Expand Down Expand Up @@ -380,7 +381,8 @@ def writeCorrectedSam_worker(chrNameBam, chrNameBit, start, end,
replace_tags = False
if len(readTag) > 0:
if len(readTag[0]) == 3:
readTag = [(x[0], x[1], chr(x[2])) for x in readTag]
if type(readTag[2]) is int:
readTag = [(x[0], x[1], chr(x[2])) for x in readTag]
replace_tags = True
else:
replace_tags = True
Expand Down

0 comments on commit e7615d5

Please sign in to comment.