Skip to content

Commit

Permalink
CI: add new PTU data file
Browse files Browse the repository at this point in the history
  • Loading branch information
tritemio committed Nov 30, 2016
1 parent a3e6daf commit be1c77d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ before_script:
- wget https://ndownloader.figshare.com/files/3350663 -O 0023uLRpitc_NTP_20dT_0.5GndCl.sm
- wget https://github.com/Photon-HDF5/phconvert/files/231343/Cy3.Cy5_diff_PIE-FRET.ptu.zip
- unzip Cy3.Cy5_diff_PIE-FRET.ptu.zip
- wget https://ndownloader.figshare.com/files/6955091 -O 161128_DM1_50pM_pH74.ptu
- wget https://www.dropbox.com/s/s8zzxcq7d2nfqe0/20161027_DM1_1nM_pH7_20MHz1.ptu.zip
- unzip 20161027_DM1_1nM_pH7_20MHz1.ptu.zip
- wget https://github.com/dwaithe/FCS_point_correlator/raw/master/focuspoint/topfluorPE_2_1_1_1.pt3
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ before_test:
- ps: wget https://ndownloader.figshare.com/files/3350663 -OutFile 0023uLRpitc_NTP_20dT_0.5GndCl.sm
- ps: wget https://github.com/Photon-HDF5/phconvert/files/231343/Cy3.Cy5_diff_PIE-FRET.ptu.zip -OutFile Cy3.Cy5_diff_PIE-FRET.ptu.zip
- 7z e Cy3.Cy5_diff_PIE-FRET.ptu.zip
- ps: wget https://ndownloader.figshare.com/files/6955091 -OutFile 161128_DM1_50pM_pH74.ptu
- curl -fsSLO https://www.dropbox.com/s/s8zzxcq7d2nfqe0/20161027_DM1_1nM_pH7_20MHz1.ptu.zip
- 7z e 20161027_DM1_1nM_pH7_20MHz1.ptu.zip
- ps: wget https://github.com/dwaithe/FCS_point_correlator/raw/master/focuspoint/topfluorPE_2_1_1_1.pt3 -OutFile topfluorPE_2_1_1_1.pt3
Expand Down
9 changes: 7 additions & 2 deletions phconvert/test_pqreader.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,21 @@


def dataset1():
fn = '20161027_DM1_1nM_pH7_20MHz1.ptu'
fn = '161128_DM1_50pM_pH74.ptu'
fname = DATADIR + fn
return fname

def dataset2():
fn = '20161027_DM1_1nM_pH7_20MHz1.ptu'
fname = DATADIR + fn
return fname

def dataset3():
fn = 'Cy3+Cy5_diff_PIE-FRET.ptu'
fname = DATADIR + fn
return fname

@pytest.fixture(scope="module", params=[dataset1, dataset2])
@pytest.fixture(scope="module", params=[dataset1, dataset2, dataset3])
def filename(request):
fname = request.param()
return fname
Expand Down

0 comments on commit be1c77d

Please sign in to comment.