Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
e0e34c3
First attempt at TravisCI, hopefully it will work
skbrimer Nov 7, 2017
5c0ac48
renamed file extentison from .yaml to .yml
skbrimer Nov 7, 2017
377908e
Delete .travis.yaml
skbrimer Nov 7, 2017
dc413ae
changed the format of the yaml file
skbrimer Nov 7, 2017
485ffb2
correctly spelled language.... grrr...
skbrimer Nov 7, 2017
cad5766
added script for setup.py
skbrimer Nov 7, 2017
b35c39a
removed pypy from yaml file
skbrimer Nov 7, 2017
9e98d0a
Added TravisCL Master Branch header to the markdown file
skbrimer Nov 7, 2017
5a8d7ed
formating for the traviscl
skbrimer Nov 7, 2017
f2132ef
Update README.md
skbrimer Nov 7, 2017
be88192
Update README.md
skbrimer Nov 7, 2017
f3f3a4d
A readme file for the first commit on the dev branch
skbrimer Nov 7, 2017
23c1720
add python 3.3,3.4,3.5,3.6 test should pass first build
skbrimer Nov 7, 2017
5abe661
added from __future__ import print
skbrimer Nov 7, 2017
8195389
changed print to print() for setup.py and remove 3.3 and 3.4 from .tr…
skbrimer Nov 7, 2017
3f2fad5
added travis badge to readme_py3
skbrimer Nov 7, 2017
88a099f
added future and six to requirements for py2 and py3
skbrimer Nov 7, 2017
643fb0a
removed six, already in python-site packages
skbrimer Nov 7, 2017
b4f5a31
added from future.utils import raise_from, for exception change
skbrimer Nov 7, 2017
70549e7
added future import for print function
skbrimer Nov 7, 2017
9ff26c8
added print import from future
skbrimer Nov 7, 2017
d10f7a5
add exception import from future.utils
skbrimer Nov 7, 2017
d669d97
add print function import from future
skbrimer Nov 7, 2017
2643732
fixed typo
skbrimer Nov 7, 2017
0f02c5a
move from __future__ import print_function to first line
skbrimer Nov 7, 2017
bac8f0e
moved print import to line 1
skbrimer Nov 7, 2017
17d8fbf
added future.utils raise_from
skbrimer Nov 7, 2017
d3465c7
added future import of print_function
skbrimer Nov 7, 2017
236a895
changed the test file
skbrimer Nov 7, 2017
c3063f3
edit directory info for shell test
skbrimer Nov 7, 2017
4ef0ed8
fixed typo, test --> tests
skbrimer Nov 7, 2017
6968c9e
added print function from future
skbrimer Nov 8, 2017
7ded73a
fixed spaces vs tabs and indents
skbrimer Nov 8, 2017
e0dcd79
update relational packege calling for python3, getting closer
skbrimer Nov 8, 2017
ff53756
attempting to get travis to run the build in shell script test
skbrimer Nov 8, 2017
d253d08
to-do list of pending work to convert
skbrimer Nov 9, 2017
0586852
added backward imports for py2 and changed format for py3
skbrimer Nov 9, 2017
8342725
format changes
skbrimer Nov 9, 2017
aa0ca9d
format changes
skbrimer Nov 9, 2017
7aee448
updated to-do
skbrimer Nov 9, 2017
ce3fd63
updated for python3
skbrimer Nov 9, 2017
ae7249a
still needs work, it is not finding the data, but not crashing
skbrimer Nov 9, 2017
85517f3
updated TODO, added decode to metadata output still working on squiggle
skbrimer Nov 13, 2017
3eb8b2b
update hdf5 calls
skbrimer Dec 10, 2017
9aa5aaf
trying to tes the extract change
skbrimer Dec 10, 2017
0dc8585
trying to tes the extract change
skbrimer Dec 10, 2017
cc1a1d4
trying to test the extract change
skbrimer Dec 10, 2017
7775e95
removed squiggle testing, exit with error on Travis CI but not on mac…
skbrimer Dec 10, 2017
7bc0b13
fixed indent error, now NX works. Still need to fix print error
skbrimer Dec 10, 2017
cfbb0ed
update ignore file
skbrimer Dec 10, 2017
c0666ff
fixed spacing issues for stats.py
skbrimer Dec 11, 2017
4e614c2
removed testing print statements
skbrimer Dec 11, 2017
b0fd24d
added py3 testing support
skbrimer Dec 11, 2017
44e22c5
added py3 testing support
skbrimer Dec 11, 2017
4ae8803
updated tests for py2 and py3, now has set order for nucdist
skbrimer Dec 11, 2017
6baff06
updated for bash testing script testing
skbrimer Dec 11, 2017
135b0a6
stupid typos, updated fgor bash script testing
skbrimer Dec 11, 2017
460c0d1
appveyor needs updating failing due to file not existing
skbrimer Dec 11, 2017
d017b0a
updating wheel info, maybe it will work
skbrimer Dec 11, 2017
a5997d3
updating wheel info, maybe it will work
skbrimer Dec 11, 2017
322f032
added back putfile, deleted by accident
skbrimer Dec 11, 2017
5612876
corrected url for seaborn
skbrimer Dec 11, 2017
9882ea2
trying to use conda to install seaborn
skbrimer Dec 11, 2017
6448e85
still issue with url
skbrimer Dec 11, 2017
2581dc5
still issue with url
skbrimer Dec 11, 2017
765a1ee
comment out seaborn, issues with server
skbrimer Dec 11, 2017
498ff51
added freetype-gl script to appveyor
skbrimer Dec 12, 2017
cb0c559
added freetype-gl script to appveyor, right format?
skbrimer Dec 12, 2017
f0673c2
playing with badges
skbrimer Dec 16, 2017
a70e0c0
Update READMEpy3.md
skbrimer Dec 16, 2017
f59b9c8
added python badge
skbrimer Dec 16, 2017
b5d07fe
cleaning up
skbrimer Dec 16, 2017
8dd246a
attempting to merge
skbrimer Dec 16, 2017
e9ea778
fixed conflict with CI file
skbrimer Dec 16, 2017
97a67d4
fixed conflict with CI file
skbrimer Dec 16, 2017
cf64689
fixed conflict with CI file
skbrimer Dec 17, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@
build/
dist/
*.egg-info
ENV*
.coverage
.gitignore
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# travis ymal file for python3 development

language: python

python:
- 2.7
- 3.5
- 3.6

install:
- pip install -r requirements.txt
- python setup.py install
script:
- python setup.py install
- cd test_data/
- bash poretools-tests.sh
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Build Status](https://travis-ci.org/skbrimer/poretools.svg?branch=master)](https://travis-ci.org/skbrimer/poretools) ![python version](https://img.shields.io/badge/python-2.7%2C%203.3%2C%203.4%2C%203.5%2C%203.6-blue.svg)

### poretools: a toolkit for working with nanopore sequencing data from Oxford Nanopore.

*Nick Loman and Aaron Quinlan*
Expand Down
97 changes: 97 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# TO-DO For python3 and python2 compatiablity of poretools

## Just conversion to py3, py2 not tested... yet

1. **stats** - printing throughout the loop for each addition of reads, failing tests. Expected outcome is one output.
-1. also not generating N50 or N75, don't know if this is a byproduct of the print issue or a sepperate issue

2. **qualdist** - seems to be working, but has too many decimals and fails test.

3. **nucdist** - seems to be working, but has too many decimals and fails test.

4. ~~**yield_plot**
Traceback (most recent call last):
File "/home/sbrimer/Documents/poretools/ENV/bin/poretools", line 11, in <module>
load_entry_point('poretools==0.6.0', 'console_scripts', 'poretools')()
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/poretools_main.py", line 539, in main
args.func(parser, args)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/poretools_main.py", line 55, in run_subtool
submodule.run(parser, args)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/yield_plot.py", line 96, in run
plot_collectors_curve(args, start_times, read_lengths)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/yield_plot.py", line 35, in plot_collectors_curve
d = {'start': [start_times[n] for n in xrange(0, len(start_times), step)],
NameError: name 'xrange' is not defined~~

5. **squiggle** - need to rework next ~~and import iterateitems~~
`WARNING:poretools:Could not extract template events for read: test_data/2016_3_4_3507_1_ch13_read1474_strand.fast5.
`

6. ~~**time**
Traceback (most recent call last):
File "/home/sbrimer/Documents/poretools/ENV/bin/poretools", line 11, in <module>
load_entry_point('poretools==0.6.0', 'console_scripts', 'poretools')()
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/poretools_main.py", line 539, in main
args.func(parser, args)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/poretools_main.py", line 55, in run_subtool
submodule.run(parser, args)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/times.py", line 25, in run
start_time = fast5.get_start_time()
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/Fast5File.py", line 587, in get_start_time
exp_start_time = self.get_exp_start_time()
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/Fast5File.py", line 431, in get_exp_start_time
if self.keyinfo['tracking_id'].attrs['exp_start_time'].endswith('Z'):
TypeError: endswith first arg must be bytes or a tuple of bytes, not str~~

7. ~~**occupancy** Traceback (most recent call last):
File "/home/sbrimer/Documents/poretools/ENV/bin/poretools", line 11, in <module>
load_entry_point('poretools==0.6.0', 'console_scripts', 'poretools')()
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/poretools_main.py", line 539, in main
args.func(parser, args)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/poretools_main.py", line 55, in run_subtool
submodule.run(parser, args)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/occupancy.py", line 81, in run
plot_performance(parser, args, tot_reads_per_pore)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/occupancy.py", line 39, in plot_performance
d = {'rownum': range(1,17)*32, TypeError: unsupported operand type(s) for *: 'range' and 'int~~
8. ~~**combine** - not sure about this one, may need work or better understanding of how to use it.~~ User error :/

9. ~~**index**
Traceback (most recent call last):
File "/home/sbrimer/Documents/poretools/ENV/bin/poretools", line 11, in <module>
load_entry_point('poretools==0.6.0', 'console_scripts', 'poretools')()
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/poretools_main.py", line 539, in main
args.func(parser, args)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/poretools_main.py", line 55, in run_subtool
submodule.run(parser, args)
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/index.py", line 35, in run
start_time = fast5.get_start_time()
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/Fast5File.py", line 587, in get_start_time
exp_start_time = self.get_exp_start_time()
File "/home/sbrimer/Documents/poretools/ENV/lib/python3.5/site-packages/poretools-0.6.0-py3.5.egg/poretools/Fast5File.py", line 431, in get_exp_start_time
if self.keyinfo['tracking_id'].attrs['exp_start_time'].endswith('Z'):
TypeError: endswith first arg must be bytes or a tuple of bytes, not str~~

10. **readstats**
~~start_time channel_number read_number template_events complement_events
poretools internal error in file 'test_data/YYYYMMDD_HHMM_SampleID/Fail/1/2016_3_4_3507_1_ch120_read443_strand.fast5': unknown HDF5 structure: can't find read block item
Please report this error (with the offending file) to:
https://github.com/arq5x/poretools/issues~~ ** Not and error, test data has older file structure **

11. ~~ **logger** - doesn't log currently?~~ prints to standard out


## Working Modules - for py3
1. **fastq**
2. **fasta**
3. **winner**
4. **qualpos**
5. **hist**
6. **tabular**
7. **metadata**
8. **combine**
9. **index**
10. **times**
11. **occupancy**
12. **yield_plot**
13. **readstats**
47 changes: 31 additions & 16 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,22 +91,22 @@ install:
# compiled extensions and are not provided as pre-built wheel packages,
# pip will build them from source using the MSVC compiler matching the
# target Python version and architecture
#

- ps: if ($env:PYTHON_ARCH -eq "32") { `
Invoke-WebRequest "http://www.lfd.uci.edu/~gohlke/pythonlibs/djcobkfp/h5py-2.5.0-cp27-none-win32.whl" -OutFile "C:\HDF5\h5py-2.5.0-cp27-none-win32.whl";
pip install C:\HDF5\h5py-2.5.0-cp27-none-win32.whl `
} else { `
Invoke-WebRequest "http://www.lfd.uci.edu/~gohlke/pythonlibs/djcobkfp/h5py-2.5.0-cp27-none-win_amd64.whl" -OutFile "C:\HDF5\h5py-2.5.0-cp27-none-win_amd64.whl";
pip install C:\HDF5\h5py-2.5.0-cp27-none-win_amd64.whl `
Invoke-WebRequest "https://pypi.python.org/packages/4e/5b/1da1bf9537224adb6ca9148ca34fa9726a878660bbb45705747402d5a854/h5py-2.7.1-cp27-cp27m-win32.whl#md5=849ff329ce2cebb4d2c858eac0d2ff96" -OutFile "C:\HDF5\h5py-2.5.0-cp27-cp27m-win32.whl";
pip install C:\HDF5\h5py-2.5.0-cp27-cp27m-win32.whl `
} else { `
Invoke-WebRequest "https://pypi.python.org/packages/98/43/cb0345e3e47cbc1958200d2ecb536a202550fc58c54134aab6b0bb1d9794/h5py-2.7.1-cp27-cp27m-win_amd64.whl#md5=02f06d0f8208832c4b5cdddcad954932" -OutFile "C:\HDF5\h5py-2.5.0-cp27-cp27m-win_amd64.whl";
pip install C:\HDF5\h5py-2.5.0-cp27-cp27m-win_amd64.whl `
}

- ps: if ($env:PYTHON_ARCH -eq "32") { `
Invoke-WebRequest "http://www.lfd.uci.edu/~gohlke/pythonlibs/djcobkfp/matplotlib-1.5.1-cp27-none-win32.whl" -OutFile "C:\HDF5\matplotlib-1.5.1-cp27-none-win32.whl";
pip install C:\HDF5\matplotlib-1.5.1-cp27-none-win32.whl `
} else { `
Invoke-WebRequest "http://www.lfd.uci.edu/~gohlke/pythonlibs/djcobkfp/matplotlib-1.5.1-cp27-none-win_amd64.whl" -OutFile "C:\HDF5\matplotlib-1.5.1-cp27-none-win_amd64.whl";
pip install C:\HDF5\matplotlib-1.5.1-cp27-none-win_amd64.whl `
}
#- ps: if ($env:PYTHON_ARCH -eq "32") { `
# Invoke-WebRequest "http://www.lfd.uci.edu/~gohlke/pythonlibs/djcobkfp/matplotlib-1.5.1-cp27-none-win32.whl" -OutFile "C:\HDF5\matplotlib-1.5.1-cp27-none-win32.whl";
# pip install C:\HDF5\matplotlib-1.5.1-cp27-none-win32.whl `
# } else { `
# Invoke-WebRequest "http://www.lfd.uci.edu/~gohlke/pythonlibs/djcobkfp/matplotlib-1.5.1-cp27-none-win_amd64.whl" -OutFile "C:\HDF5\matplotlib-1.5.1-cp27-none-win_amd64.whl";
# pip install C:\HDF5\matplotlib-1.5.1-cp27-none-win_amd64.whl `
# }

#- ps: Invoke-WebRequest "https://pypi.python.org/packages/2.7/h/h5py/h5py-2.5.0.win32-py2.7.exe" -OutFile "C:\HDF5\h5py-2.5.0.win32-py2.7.exe"
#- ps: Invoke-WebRequest "http://www.lfd.uci.edu/~gohlke/pythonlibs/djcobkfp/h5py-2.5.0-cp27-none-win%PYTHON_ARCH%.whl" -OutFile "C:\HDF5\h5py-2.5.0-cp27-none-win%PYTHON_ARCH%.whl"
Expand All @@ -119,12 +119,27 @@ install:
#- "%CMD_IN_ENV% pip install C:\\HDF5\\matplotlib-1.5.1-cp27-none-win32.whl"


- ps: Invoke-WebRequest "http://www.lfd.uci.edu/~gohlke/pythonlibs/djcobkfp/seaborn-0.7.0-py2.py3-none-any.whl" -OutFile "C:\HDF5\seaborn-0.7.0-py2.py3-none-any.whl"
#- ps: wget "https://www.lfd.uci.edu/~gohlke/pythonlibs/seaborn-0.8.1-py2.py3-none-any.whl" -OutFile "C:\HDF5\seaborn-0.8.1-py2.py3-none-any.whl"
#- "%CMD_IN_ENV% C:\\HDF5\\h5py-2.5.0.win32-py2.7.exe"
- ps: pip install C:\\HDF5\\seaborn-0.7.0-py2.py3-none-any.whl

#- ps: pip install C:\\HDF5\\seaborn-0.8.1-py2.py3-none-any.whl
- '"C:\Program Files (X86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat"'
# Remove the VS Xamarin targets to reduce AppVeyor specific noise in build
# logs. See also http://help.appveyor.com/discussions/problems/4569
- del "C:\Program Files (x86)\MSBuild\12.0\Microsoft.Common.targets\ImportAfter\Xamarin.Common.targets"
- ps: Start-FileDownload https://github.com/glfw/glfw/archive/3.2.1.zip -FileName glfw-3.2.1.zip
- unzip glfw-3.2.1.zip
- cd glfw-3.2.1
- cmake -G "Visual Studio 12" -DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_EXAMPLES=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_DOCS=OFF .
- cmake --build . --config Release --target install -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:minimal
- cd ..

before_build:
- if not exist build\NUL mkdir build
- cd build

build_script:
- cmake -G "Visual Studio 12" -Dfreetype-gl_BUILD_APIDOC=OFF -Dfreetype-gl_BUILD_TESTS=OFF "-Dglfw3_DIR=C:/Program Files (x86)/GLFW/lib/cmake/glfw3" ..
- cmake --build . --config RelWithDebInfo -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /verbosity:minimal
# Build the compiled extension
- "%CMD_IN_ENV% python setup.py build"
- "%CMD_IN_ENV% python setup.py install"
Expand Down
Loading