New upstream version 0.12.0.1+ds

diff --git a/MANIFEST.in b/MANIFEST.in
index 3f2a9cbc8bd011dc89aeb267da17d4103bbe68d1..20b777737525827e99715a807d9d2e65f0accf35 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -15,12 +15,20 @@ include pysam/libc*.pyx
 include pysam/libc*.c
 include pysam/*.c
 include pysam/*.h
+
+# samtools
 include samtools/configure
 include samtools/config.mk.in
 include samtools/config.h.in
 include samtools/*.h
 exclude samtools/config.h
 include samtools/*/*.h
+
+# bcftools
+include bcftools/*.h
+exclude bcftools/config.h
+
+# htslib
 include htslib/*.c
 include htslib/*.h
 exclude htslib/config.h

diff --git a/bcftools/config.h b/bcftools/config.h
new file mode 100644 (file)
index 0000000..f8fff59
--- /dev/null
+++ b/bcftools/config.h
@@ -0,0 +1,2 @@
+/* empty config.h created by pysam */
+/* conservative compilation options */

diff --git a/doc/release.rst b/doc/release.rst
index 4a9b35ce2faff4b3a616cd2940f484bf5fc3392f..18af4ad38e8d8d0223628e4191081eb6230f0b63 100644 (file)
--- a/doc/release.rst
+++ b/doc/release.rst
@@ -2,6 +2,12 @@
 Release notes
 =============
 
+Release 0.12.0.1
+================
+
+Bugfix release to solve compilation issue due to missinge
+bcftools/config.h file.
+
 Release 0.12.0
 ==============
 
@@ -31,6 +37,7 @@ contains a series of bugfixes.
 * [#496] upgrade to htslib/samtools/bcftools versions 1.5
 * add start/stop to AlignmentFile.fetch() to be consistent with
   VariantFile.fetch(). "end" is kept for backwards compatibility.
+* [#512] add get_index_statistics() method to AlignmentFile.
 
 Upcoming changes:
 

diff --git a/pysam/version.py b/pysam/version.py
index 89cf2de9759efea15704a99f9c019eddb0135cd4..2a416f1f06f8fc7b63e63ef50fc77f225b4d5d5e 100644 (file)
--- a/pysam/version.py
+++ b/pysam/version.py
@@ -1,5 +1,5 @@
 # pysam versioning information
-__version__ = "0.12"
+__version__ = "0.12.0.1"
 
 # TODO: upgrade number
 __samtools_version__ = "1.5"

diff --git a/run_tests_travis.sh b/run_tests_travis.sh
index 45c928efc8061802fce3728a384e971068b1c4e6..fa448575435db8ff864f5707827a912214eb6ccb 100755 (executable)
--- a/run_tests_travis.sh
+++ b/run_tests_travis.sh
@@ -85,6 +85,8 @@ echo "checking for presence of config.h files in tar-ball"
 tar -tvzf dist/pysam-*.tar.gz | grep "config.h$"
 
 if [ $? != 1 ]; then
+    echo "ERROR: found config.h in tar-ball"
+    tar -tvzf dist/pysam-*.tar.gz | grep "config.h%"
     exit 1
 fi
 

diff --git a/setup.py b/setup.py
index 5b23d2025bff4681aba349299030e7266408d0ec..66783aea4b3be2e6ffd19a8a98a04d36196b99ae 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -134,7 +134,12 @@ package_list = ['pysam',
 package_dirs = {'pysam': 'pysam',
                 'pysam.include.samtools': 'samtools',
                 'pysam.include.bcftools': 'bcftools'}
-config_headers = ["samtools/config.h"]
+
+# list of config files that will be automatically generated should
+# they not already exist or be created by configure scripts in the
+# subpackages.
+config_headers = ["samtools/config.h",
+                  "bcftools/config.h"]
 
 from cy_build import CyExtension as Extension, cy_build_ext as build_ext