Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dependency installation #2

Open
wants to merge 515 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
515 commits
Select commit Hold shift + click to select a range
6038b86
disabling the hyphy test for now
mshakya Apr 3, 2018
004543a
now just testing number of sequence in alignment file
mshakya Apr 3, 2018
af644d9
turning OFF PAML test for now, too slow, will need a quicker test
mshakya Apr 3, 2018
5cab18a
removing the 30 minute wait and see option
mshakya Apr 3, 2018
b911503
more information on how to run it
mshakya Apr 3, 2018
6974cd9
now adding test to docker itself
mshakya Apr 3, 2018
d012fab
[skip ci] minor change in README
mshakya Apr 3, 2018
a619645
[skip ci] commenting out the test
mshakya Apr 3, 2018
83c10db
[skip ci] suggestions from Paul
mshakya Apr 3, 2018
910f20d
[skip ci] added more detail about gff file being needed for selection…
mshakya Apr 3, 2018
095e8e5
commenting out mash runs for option 0 and 1 dont need it there.
mshakya Apr 4, 2018
eb8a041
[skip ci] exposed option for eukarya
mshakya Apr 4, 2018
d0527a1
elaborate exit messages
mshakya Apr 4, 2018
99e1768
test on errror messages
mshakya Apr 4, 2018
70136b4
test on threshold implementation
mshakya Apr 4, 2018
cebd5f0
[skip ci] fastq should be decompressed
mshakya Apr 4, 2018
e091ba8
[skip ci] added cwd
mshakya Apr 4, 2018
aaacdb9
corrected the not being parsed during error message
mshakya Apr 9, 2018
6c5c9cb
now it accepts gff3 files
mshakya Apr 9, 2018
975d364
TODOs added, unset MAFFT, and parallelizing PAML run
mshakya Apr 30, 2018
7a128c5
[skip ci] minor comments
mshakya May 16, 2018
bfcecef
adding script to further parse SNPs
mshakya May 17, 2018
33f4e4d
added BioSeqIO perl pacakge
mshakya May 17, 2018
cd4408b
add BSD-3 LICENSE. correct files_names with many dots
chienchi Jun 4, 2018
5f906f7
working on rerun options
mshakya Jun 8, 2018
4b6958f
merging with older version
mshakya Jun 18, 2018
d4e63d5
major changes before release in test scripts and installation script
mshakya Jun 19, 2018
3f476d2
handling the version number of perl
mshakya Jun 19, 2018
398eb1f
another version issue
mshakya Jun 19, 2018
34eaab4
yet another missing version issue
mshakya Jun 19, 2018
ffe8304
remove IO handle
mshakya Jun 19, 2018
e203745
Bioseqio updated
mshakya Jun 19, 2018
9815fb9
problem with Bio installtion, now forcing it
mshakya Jun 19, 2018
af7b4e4
disabling later installation of Bio
mshakya Jun 19, 2018
e0aa933
checked locally
mshakya Jun 19, 2018
c86b77a
making sure .travis is activateing phame env
mshakya Jun 19, 2018
650b320
modify travis
mshakya Jun 19, 2018
81505f5
add alinger option for PhaME. support bowtie/bwa/minimap2
chienchi Jun 19, 2018
6737287
remmoved sh
mshakya Jun 19, 2018
fd6fa5c
fixing merges
mshakya Jun 23, 2018
875198b
new script updated
mshakya Jun 25, 2018
d5c13ce
tested test1, working!
mshakya Jun 25, 2018
59a16fd
test 1 and test 2 working
mshakya Jun 25, 2018
4b04b81
working till test 13
mshakya Jun 26, 2018
dfd07bc
tested all tests now
mshakya Jun 26, 2018
88e07d3
fixes for test 14, which is working now
mshakya Jun 26, 2018
785be4a
Merge pull request #1 from mshakya/master
chienchi Jun 26, 2018
0982d97
updating .travis to use docker
mshakya Jun 27, 2018
58a2a84
commenting out all non needed categories
mshakya Jun 27, 2018
4b6068b
renamed and made it executable
mshakya Jun 27, 2018
790a2e5
only using 1 test dataset now
mshakya Jun 28, 2018
9ab6f98
removing ecoli test dataset
mshakya Jun 28, 2018
b962dea
fixing the travis tests
mshakya Jun 28, 2018
51cc6ed
adding a dash to chmod
mshakya Jun 28, 2018
07f83e5
export PATH, it was this or restart the terminal,
mshakya Jun 28, 2018
e76e40f
typo and disabling docker for now
mshakya Jun 28, 2018
4b2ec7a
[skip ci] updating version #
mshakya Jun 28, 2018
b8c1fdd
adding things to check for dependencies
mshakya Jul 3, 2018
efec623
latest tests
mshakya Jul 23, 2018
dbcfd31
removing packages that are not needed
mshakya Jul 23, 2018
445e83c
added conda install
mshakya Jul 24, 2018
f0f641f
corrected chienchi name and increased number of processors
mshakya Jul 24, 2018
88678b3
fixed miscalculation of core genome in summary statistics and now
mshakya Aug 2, 2018
35f34b4
fixed the error
mshakya Aug 6, 2018
7019d2c
fixed the bug that was not counting the last gap
mshakya Aug 6, 2018
11a2a22
fixed gap problem, now counting coordinate where gap was
mshakya Aug 6, 2018
9235898
correcting for the wrong calculation of genome length, no need for +1
mshakya Aug 6, 2018
b74c1e9
make it print product in stats.txt
mshakya Aug 7, 2018
d270fdc
now parsing CDScoords file with tab, and working on mapping core posi…
mshakya Aug 8, 2018
75f84c4
now also prints gene information in _stats.txt file
mshakya Aug 8, 2018
9fe4451
script from Chienc-Chi to parrse for canonical snps
mshakya Aug 8, 2018
6beb414
read the docs
mshakya Aug 17, 2018
73df7a8
adding index.rst
mshakya Aug 17, 2018
1299453
base stuff for readthedocs
mshakya Aug 17, 2018
d544127
[skip ci] installation document
mshakya Aug 17, 2018
3deef61
[skip ci] added badge for read the docs
mshakya Aug 17, 2018
a488daa
[skip ci] added dependencies doc
mshakya Aug 17, 2018
c6469c0
[skip ci] readthedocs
mshakya Aug 17, 2018
a91e287
[skip ci] rearranged
mshakya Aug 17, 2018
03104e4
docker stuff [skip ci]
mshakya Aug 17, 2018
afbea82
changing FastTreeMP to just FastTree
mshakya Aug 20, 2018
26cb52f
adding hyphy batch files
mshakya Aug 20, 2018
79106f5
one more!
mshakya Aug 20, 2018
ffebe95
Template Files from HyPhy
mshakya Aug 20, 2018
036b0d7
updated aBSREL.bf with new version from hyphy of conda
mshakya Aug 20, 2018
672b6f5
location of templatefile
mshakya Aug 20, 2018
34b810d
added thread option
mshakya Aug 20, 2018
150a5f3
[skip ci] now printing messages
mshakya Aug 26, 2018
49624d5
more print messages [skip ci]
mshakya Aug 27, 2018
1bd7110
corrected expected result from test
mshakya Sep 6, 2018
432e734
made it pick given reference
mshakya Sep 6, 2018
440c094
now checks dependencies before run, and tells which one is missing
mshakya Sep 6, 2018
0a0c0eb
now also prints linear coverage information
mshakya Sep 6, 2018
089e1e0
cleaning up print screen messages
mshakya Sep 6, 2018
c20517a
[skip ci] redirecting commands to logfile.
mshakya Sep 6, 2018
243ea66
more detailed tests. and errors out if ME selected and all genes have…
mshakya Sep 6, 2018
847ecac
sequestering what to print and what not to
mshakya Sep 7, 2018
6f96e80
arranged print screen methods
mshakya Sep 8, 2018
5f17321
removed unncessary printings
mshakya Sep 8, 2018
1ed6195
adding bcftools
mshakya Sep 8, 2018
bad098c
now installing phame from conda
mshakya Sep 8, 2018
6050b86
[adding bwa]
mshakya Sep 8, 2018
821d1d3
[skip ci]
mshakya Sep 8, 2018
d2f9855
all tools
mshakya Sep 8, 2018
49757d9
removing test 3
mshakya Sep 8, 2018
94604ec
more info [skip ci]
mshakya Sep 9, 2018
49caaa1
[skip ci] more info
mshakya Sep 9, 2018
a6f4127
formats using rst
mshakya Sep 9, 2018
f10aed0
[skip ci] formatting
mshakya Sep 10, 2018
20b28a8
formatting readthedocs[skip ci]
mshakya Sep 10, 2018
6d6d8ce
[skip ci] formatting
mshakya Sep 10, 2018
cae8494
[skip ci] format
mshakya Sep 10, 2018
7eb37b2
[skip ci] formatting test
mshakya Sep 10, 2018
bd175cf
[skip ci] formatting issues
mshakya Sep 10, 2018
b2686d4
[skip ci] formatting
mshakya Sep 10, 2018
01b58db
[skip ci] formatting
mshakya Sep 10, 2018
41c187a
[skip ci] minor formatting
mshakya Sep 10, 2018
c326d16
[skip ci] formatting
mshakya Sep 10, 2018
82c9cf2
[skip ci] minor formatting
mshakya Sep 10, 2018
beb56f6
[skip ci] changing things around for index
mshakya Sep 10, 2018
648e3c4
more information added [skip ci]
mshakya Sep 10, 2018
4f1dd52
moved [skip ci]
mshakya Sep 10, 2018
dcd882b
formatting [skip ci]
mshakya Sep 10, 2018
73bf145
[skip ci] formatting
mshakya Sep 10, 2018
c7eea58
1. changed the way it gets FastTree version
mshakya Sep 11, 2018
6bcccdd
[skip ci] more info on readthedocs
mshakya Sep 11, 2018
d462388
[skip ci] more information
mshakya Sep 11, 2018
9eac6a7
[skip ci] more info
mshakya Sep 12, 2018
89d9328
[skip ci] added zoom in analysis help
mshakya Sep 12, 2018
7dc971c
[skip ci] more details
mshakya Sep 12, 2018
a1e8a13
[skip ci] correct link
mshakya Sep 12, 2018
9a7219c
[skip ci] changed version
mshakya Sep 12, 2018
8b4bab3
now it also outputs an alignment file with all monomorphic sites
mshakya Sep 14, 2018
3a133f5
[skip ci] added file type
mshakya Sep 14, 2018
06a364c
[skip ci] trimming things off README
mshakya Sep 14, 2018
12ecce5
creating docker
mshakya Sep 28, 2018
59152cc
[SKIP CI] dockerfile, add channels
mshakya Sep 28, 2018
4d1cfbe
[skip ci] license information updated
mshakya Sep 28, 2018
67df8d6
just calling it phame [skip ci]
mshakya Sep 28, 2018
ca47dcc
changing name to phame in test also
mshakya Sep 28, 2018
6e14fd6
changing log file name
mshakya Oct 3, 2018
c227574
changing how comparesketch is called
mshakya Oct 3, 2018
520a807
now outputs different tables
mshakya Oct 4, 2018
5402893
[skip ci] changing version number
mshakya Oct 4, 2018
e7c4ad2
integrating iqtree
mshakya Oct 10, 2018
4bdf812
fixing tests
mshakya Oct 10, 2018
7219b37
now making it install phame through conda
mshakya Oct 10, 2018
af080ec
adding channels in travis
mshakya Oct 10, 2018
5dce7fe
adding yes
mshakya Oct 10, 2018
04212ea
changing test to 7
mshakya Oct 10, 2018
b80ef3b
[skip ci] adding license information
mshakya Oct 10, 2018
6ccfa08
added SNPSfilter option
mshakya Oct 12, 2018
f0c6c15
snp_filter dta type to floating point
mshakya Oct 12, 2018
f5e7c56
added log files in gitignore
mshakya Oct 12, 2018
e40474d
removed hyphy attachement
mshakya Oct 12, 2018
0fc7f98
changed default snp filter value to 0.o
mshakya Oct 12, 2018
99e5f2a
removed bcf file to be moved
mshakya Oct 12, 2018
dcc1a88
adding snpsfilter
mshakya Oct 24, 2018
334c935
adding patrick email
mshakya Oct 24, 2018
7a3c71f
Merge pull request #4 from LANL-Bioinformatics/master
mshakya Oct 24, 2018
6aca0aa
cleaning up
mshakya Oct 24, 2018
4c12341
Merge branch 'master' of https://github.com/mshakya/PhaME
mshakya Oct 24, 2018
418da8b
information on how to spun GUI
mshakya Nov 19, 2018
d88fd7f
correcting formatting
mshakya Nov 19, 2018
56ee214
Merge pull request #2 from mshakya/master
mshakya Nov 20, 2018
4fa7833
minor correction [skip ci]
mshakya Nov 20, 2018
a0055b9
added git repo
mshakya Nov 20, 2018
21c2c58
more badges
mshakya Dec 15, 2018
846a909
[skip ci] minor change
mshakya Dec 15, 2018
b718369
splitting installation files
mshakya Dec 19, 2018
43d38d7
[skip ci] testing some doc changes
mshakya Dec 19, 2018
48b9e19
testing [skip ci]
mshakya Dec 19, 2018
fddf4b4
[skip ci] testing readthedoc
mshakya Dec 19, 2018
7df38a8
[skip ci] fixing readthedocs
mshakya Dec 19, 2018
6d34f28
still fixing [skip ci]
mshakya Dec 20, 2018
60558de
[skip ci] moving files around
mshakya Dec 20, 2018
5087503
[skip ci] image file
mshakya Dec 20, 2018
9394293
[skip ci] renaming files
mshakya Dec 20, 2018
875599d
[skip ci] arranged docs
mshakya Dec 20, 2018
3d5d775
[skip ci] changing theme
mshakya Dec 20, 2018
86c2355
changes in doc based on mark's coment
mshakya Jan 8, 2019
a213b45
changes based on mark
mshakya Jan 8, 2019
d92ea86
minor changes
mshakya Jan 8, 2019
9508526
[skip ci] header change
mshakya Jan 30, 2019
ab8b84c
Update LICENSE
chienchi Feb 26, 2019
73c3d03
Update README.md
chienchi Feb 26, 2019
7b190cc
Merge pull request #3 from mshakya/master
mshakya Feb 26, 2019
2d49a96
Merge pull request #5 from LANL-Bioinformatics/master
mshakya Feb 26, 2019
51af384
Merge pull request #4 from mshakya/master
mshakya Feb 26, 2019
923cc9c
adding details
mshakya Jul 5, 2019
2b5223e
Merge branch 'master' of https://github.com/mshakya/PhaME
mshakya Jul 5, 2019
697d6e0
more details [skip ci]
mshakya Jul 5, 2019
f3c0358
info on read alignments [skip ci]
mshakya Jul 5, 2019
2e369b5
[skip ci] details
mshakya Jul 5, 2019
e8a104f
[skip ci], snp calling info
mshakya Jul 5, 2019
5bc61ef
upto phylogeny [skip ci]
mshakya Jul 5, 2019
8a829f0
molecular evo info
mshakya Jul 6, 2019
c930ab6
mole evo [skip ci]
mshakya Jul 6, 2019
5887925
updated read the docs
mshakya Jul 6, 2019
26c141c
metadata of document [skip ci]
mshakya Jul 8, 2019
e3e61cc
setting default cutoff to 0.6
mshakya Jul 9, 2019
497049a
spelling and comments addressed [skip ci]
mshakya Jul 9, 2019
ca30292
uses alignment that has invariant sites now
mshakya Jul 10, 2019
56e1b67
Merge pull request #5 from mshakya/master
mshakya Jul 10, 2019
5cb65fc
Merge pull request #6 from LANL-Bioinformatics/master
mshakya Jul 10, 2019
0da1285
[skip ci] changing verion number
mshakya Jul 15, 2019
29f18bc
moving the default path to front
mshakya Jul 23, 2019
a53e1d5
Merge branch 'master' of https://github.com/mshakya/PhaME
mshakya Jul 23, 2019
8816815
[skip ci] B10 not B11
mshakya Sep 19, 2019
14f0034
now makes alignment with all CDS
mshakya Sep 22, 2019
81bcc4a
cleaning up scripts and then tree names
mshakya Sep 23, 2019
35a2aa8
adding eukarya option to control files
mshakya Sep 25, 2019
7c80a08
detailed installation instruction
mshakya Sep 25, 2019
aea5792
removed sollar sign
mshakya Sep 25, 2019
c36f818
removing duplicates
mshakya Sep 27, 2019
e27ac6d
adding description in introduction
mshakya Sep 27, 2019
849f02b
closing files
mshakya Sep 27, 2019
5923e89
changed HYPHYMP to hyphy
mshakya Sep 27, 2019
11a72e0
minor changes
mshakya Sep 27, 2019
704d50c
Merge pull request #6 from mshakya/master
mshakya Sep 27, 2019
953c3c0
fixing the issue with . in input ref
mshakya Oct 14, 2019
6c383b2
fixing the issue with . in input
mshakya Oct 14, 2019
6560c9a
added a test 16 that test all inputs
mshakya Oct 14, 2019
8243828
changed reference filename
mshakya Oct 14, 2019
2d92d9e
changed it to bwa
mshakya Oct 14, 2019
cb73204
changed reference name
mshakya Oct 14, 2019
6045f0f
Merge pull request #7 from mshakya/master
mshakya Jan 16, 2020
340a08e
Merge pull request #7 from LANL-Bioinformatics/master
mshakya Jan 16, 2020
26579f3
commenting out waffle
mshakya Jan 16, 2020
7913013
Merge pull request #8 from mshakya/master
mshakya Jan 16, 2020
aaecf48
updated version number
mshakya Feb 10, 2020
e9a3271
updating citation
mshakya Feb 11, 2020
42e721f
Merge branch 'master' of https://github.com/mshakya/PhaME
mshakya Feb 11, 2020
3a7f3a9
renamed
mshakya Feb 13, 2020
779f04f
ignoring vs code
mshakya Feb 13, 2020
b1a8a74
renamed
mshakya Feb 13, 2020
218a708
renaming
mshakya Mar 3, 2020
85e3062
adding to pring package Version with every run
mshakya Mar 3, 2020
d6f898b
updated reference genome in test files
mshakya Mar 3, 2020
ce01301
extra messages
mshakya Mar 5, 2020
74131db
printing more stuff on screen
mshakya Mar 6, 2020
53f92cd
fixed bootstrap bug.Iit was bootstrapping if N>0
mshakya Apr 2, 2020
7ae708b
fixed bootstrap bug
mshakya Apr 2, 2020
412a0c5
minor: updated reference file in ctl
mshakya Apr 2, 2020
158b5df
added print statement that describes the run
mshakya Apr 2, 2020
afa2ad1
added option to enter Genetic Code for translation
mshakya Apr 2, 2020
877950e
avoid self hit with buffer length
chienchi May 21, 2020
5937e2c
updated parse_version func from snippy, now it correctly parses 1.10 …
mshakya Jul 22, 2020
93c32bc
Merge pull request #9 from mshakya/master
mshakya Jul 22, 2020
d429b27
Update README.md
mshakya Nov 28, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
install.log
test/results/
test/.DS_Store
test/contigs_list.txt
test/fasta_list.txt
test/working_list.txt
src/.DS_Store
.DS_Store
test/workdirs/ebola_comp_contigs_pread/
test/workdirs/
2NG.dN
2NG.dS
2NG.t
4fold.nuc
PhaME-1.sublime-project
PhaME-1.sublime-workspace
lnf
rst
rst1
rub
sftp-config.json
thirdParty/miniconda/
thirdParty/hyphy-2.3.11/
thirdParty/messages.log
thirdParty/evolver.out
thirdParty/errors.log
messages.log
*.log
docs/_build/*
.vscode/
58 changes: 58 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
sudo: required

# services:
# - docker

language: perl
perl:
- "5.22"

before_install:
# - docker pull migun/phame-1
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -qq
# - sudo apt-get -y install -qq gcc-5 g++-5
# - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5

install:
- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
- chmod +x miniconda.sh
- ./miniconda.sh -b -f
- export PATH="/home/travis/miniconda3/bin:$PATH"
- conda update --yes -n base conda
- conda config --add channels r
- conda config --add channels defaults
- conda config --add channels conda-forge
- conda config --add channels bioconda
- conda create --yes -n phame_env
- conda install --yes -c bioconda phame -n phame_env
# - conda install --yes -c bioconda samtools>=1.7
# - conda install --yes -c bioconda bbmap>=37.62
# - conda install --yes -c bioconda bowtie2=2.3.0
# - conda install --yes -c bioconda perl-app-cpanminus=1.7039
# - conda install --yes -c bioconda bcftools
# - conda install --yes -c bioconda bwa
# - conda install --yes -c bioconda fasttree
# - conda install --yes -c bioconda bbmap
# - conda install --yes -c bioconda raxml
# - cpanm Getopt::[email protected]
# - cpanm Test::[email protected]
# - cpanm Statistics::[email protected]
# - cpanm File::[email protected]
# - cpanm File::[email protected]
# - cpanm File::[email protected]
# - cpanm Parallel::[email protected]
# - export PATH="$HOME/build/mshakya/PhaME-1/src:$HOME/build/mshakya/PhaME-1/thirdParty/miniconda/bin:$PATH"

# before_script:
# - cpanm --quiet --notest --skip-satisfied Devel::Cover::Report::Codecov

script:
- source activate phame_env
- test/TestAll.sh 2
- test/TestAll.sh 7
# - cover -test
# - docker run --rm migun/phame-1 sh test/TestAll.sh

#after_success:
# - cover -report codecov
27 changes: 27 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# This is the Dockefile to build PhaME

############################# Base Docker Image ################################

FROM continuumio/miniconda3

############################# MAINTAINER #######################################

MAINTAINER Migun Shakya <[email protected]>

############################# METADATA #######################################

LABEL version="1.0.1"
LABEL software="PhaME"
LABEL description="Phylogenetic Analysis and Molecular Evolution"
LABEL website="https://github.com/mshakya/PhaME"
LABEL tags="genomics"

############################# INSTALLATION #####################################

RUN conda config --add channels r
RUN conda config --add channels defaults
RUN conda config --add channels conda-forge
RUN conda config --add channels bioconda
RUN conda install -c bioconda phame
# RUN sh test/TestAll.sh
#############################ENVIRONMENT#####################################
Loading