Merging postreleasefix/87 to master

* postreleasefix/87: Use fixed branch of htslib to avoid lzma, bz2 dependency
Ensembl · Mar 14, 2017 · 8fd4333 · 8fd4333
2 parents 81a04a1 + c2eb8f0
commit 8fd4333
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,7 +24,7 @@ before_install:
     - cd tabix
     - make
     - cd ../
-    - git clone --branch master --depth 1 https://github.com/samtools/htslib.git
+    - git clone --branch 1.3.2 --depth 1 https://github.com/samtools/htslib.git
     - cd htslib
     - make
     - export HTSLIB_DIR=$(pwd -P)

diff --git a/scripts/variant_effect_predictor/INSTALL.pl b/scripts/variant_effect_predictor/INSTALL.pl
@@ -505,7 +505,7 @@ END
 
   # STEP 2: Check out HTSLIB / or make this a download?
   print(" - checking out HTSLib\n");
-  system "git clone -b master https://github.com/samtools/htslib.git";
+  system "git clone -b 1.3.2 https://github.com/samtools/htslib.git";
   -d './htslib' or die "git clone seems to have failed. Could not find $htslib_install_dir/htslib directory";
   chdir './htslib';