Conversation
jmarshall
added a commit
to jmarshall/pysam
that referenced
this pull request
Mar 2, 2022
Exclude samtools/bam2bcf.[ch] which (starting in samtools 1.15) are only used by bam_tview.c (which we already exclude) and contain functions that collide with bcftools. Remove obsolete exclusions for removed items. In import/pysam.h, add prefixes to several more functions that otherwise conflict between libcsamtools and libcbcftools. Fixes pysam-developers#1081. In bcftools/regidx.h, add prefixes to all functions, as these conflict with those provided by htslib/htslib/regidx.h. This is done locally within bcftools (rather than via import/pysam.h) as this issue may be resolved in future bcftools imports by PR samtools/bcftools#865.
jmarshall
added a commit
to jmarshall/pysam
that referenced
this pull request
Mar 2, 2022
Exclude samtools/bam2bcf.[ch] which (starting in samtools 1.15) are only used by bam_tview.c (which we already exclude) and contain functions that collide with bcftools. Remove obsolete exclusions for removed items. In import/pysam.h, add prefixes to several more functions that otherwise conflict between libcsamtools and libcbcftools. Fixes pysam-developers#1081. In bcftools/regidx.h, add prefixes to all functions, as these conflict with those provided by htslib/htslib/regidx.h. This is done locally within bcftools (rather than via import/pysam.h) as this issue may be resolved in future bcftools imports by PR samtools/bcftools#865.
jmarshall
added a commit
to jmarshall/pysam
that referenced
this pull request
Mar 3, 2022
Exclude samtools/bam2bcf.[ch] which (starting in samtools 1.15) are only used by bam_tview.c (which we already exclude) and contain functions that collide with bcftools. Remove obsolete exclusions for removed items. In import/pysam.h, add prefixes to several more functions that otherwise conflict between libcsamtools and libcbcftools. Fixes pysam-developers#1081. In bcftools/regidx.h, add prefixes to all functions, as these conflict with those provided by htslib/htslib/regidx.h. This is done locally within bcftools (rather than via import/pysam.h) as this issue may be resolved in future bcftools imports by PR samtools/bcftools#865.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.