diff --git a/.travis.yml b/.travis.yml index 99bc89b..268f3b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,7 @@ language: python -branches: - only: - - master python: - "3.7" sudo: false -install: - - source ./install_dependencies.sh before_script: - pip install codecov script: diff --git a/farm_blast/pipeline.py b/farm_blast/pipeline.py index 5dab4b2..4634437 100644 --- a/farm_blast/pipeline.py +++ b/farm_blast/pipeline.py @@ -242,7 +242,7 @@ def _make_combine_script(self, script_name=None): if self.test: print(self.farm_blast_script, '--test --fix_coords_in_blast_output x x', file=f) else: - print(self.farm_blast_script, '--fix_coords_in_blast_output x x', file=f) + print('farm_blast --fix_coords_in_blast_output x x', file=f) print('rm', ' '.join(self.files_to_delete), file=f) print('touch FINISHED', file=f) f.close() diff --git a/install_dependencies.sh b/install_dependencies.sh deleted file mode 100644 index 25b39f0..0000000 --- a/install_dependencies.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/bash - -set -x -set -e - -start_dir=$(pwd) - -BLAST_VERSION="2.9.0" -BLAST_DOWNLOAD_FILENAME="ncbi-blast-${BLAST_VERSION}+-x64-linux.tar.gz" -BLAST_PLUS_URL="ftp://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${BLAST_VERSION}/${BLAST_DOWNLOAD_FILENAME}" - -# Make an install location -if [ ! -d 'build' ]; then - mkdir build -fi -cd build - -# Download blast -build_dir=$(pwd) -BLAST_DOWNLOAD_PATH="$(pwd)/${BLAST_DOWNLOAD_FILENAME}" - -if [ -e "$BLAST_DOWNLOAD_PATH" ]; then - echo "Skipping download of $BLAST_PLUS_URL, $BLAST_DOWNLOAD_PATH already exists" -else - echo "Downloading $BLAST_PLUS_URL to $BLAST_DOWNLOAD_PATH" - travis_wait 40 wget $BLAST_PLUS_URL -O $BLAST_DOWNLOAD_PATH -fi - -# Untar blast -BLAST_BUILD_DIR="$(pwd)/ncbi-blast-${BLAST_VERSION}+" - -if [ -d "$BLAST_BUILD_DIR" ]; then - echo "Blast already untarred to $BLAST_BUILD_DIR, skipping" -else - echo "Untarring blast to $BLAST_BUILD_DIR" - tar xzvf $BLAST_DOWNLOAD_PATH -fi - -cd $BLAST_BUILD_DIR - -# Add blast to PATH -BLAST_BIN_DIR="$(pwd)/bin" -update_path () { - new_dir=$1 - if [[ ! "$PATH" =~ (^|:)"${new_dir}"(:|$) ]]; then - export PATH=${new_dir}:${PATH} - fi -} - -export PATH -update_path $BLAST_BIN_DIR - -py_path=$(which python3) -export PYTHONPATH=$py_path:$PYTHONPATH - -cd $start_dir - -set +e -set +x diff --git a/setup.py b/setup.py index fce9ec5..cbd917f 100644 --- a/setup.py +++ b/setup.py @@ -25,8 +25,7 @@ print(found, program, sep='\t') if not found_all_progs: - print('Cannot install because some programs from the blast+ package not found.', file=sys.stderr) - sys.exit(1) + print('Some programs from the blast+ package not found, farm_blast may not work properly.', file=sys.stderr) setup(