Update pysam/libchtslib.pxd to HTSlib 1.21 htslib/*.h declarations #1362
Conversation
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
…/*.h This reformatted function documentation duplicates that in htslib/*.h and is not easily updated when the original documentation changes. Moreover it'll be easier to keep pysam/libchtslib.pxd updated for htslib/*.h API additions when it solely contains declarations.
Tidy up whitepace, canonicalise pointer declarations as `int *p`, reformat onto a single line where appropriate. Fix `bed` typos for `beg`, spell out parameter names as per htslib/*.h declarations. Prefix struct/union/enum with cdef or ctypedef as appropriate. This PyFile_AsFile declaration from Python.h is long-since unused.
Keep hfile.h, bgzf.h, hts.h, sam.h first as other headers require types declared therein, but alphabetise the remaining header sections.
Add `const`; apply bam_hdr_t to sam_hdr_t renaming; rewrite most SAM_hdr typedef usage; use samFile typedef; use array parameter forms.
Some BGZF, htsFile, hts_itr_t, and sam_hdr_t struct fields are omitted from these Cython declarations. This commit updates the types of existing fields but generally does not add new or previously omitted fields, as we aim in future to make these structs (and some others) properly opaque. Mark deprecated HTSlib API functions as deprecated. Some may be removed at a later date. Fix bam_cigar_gen() arguments (`l` is the length) and use `int` for CIGAR opcodes in these functions. Expose only the HTSlib 1.12+ cram_block_method enumerator items.
We intend to make these structs opaque in future: their fields are present in the C declarations for implementation reasons but should not be used by user code, so there is no reason why the corresponding Cython declarations should not be as incomplete structs. Cython needs named types for some fields that can be anonymous structs in C. Rename some of these pysam-local structs so that they follow hts_opt_val_union's pattern and avoid polluting the namespace.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
The declarations in pysam/libchtslib.pxd have mostly not been updated since pysam's early days. This PR brings them up-to-date with HTSlib 1.21 (which pysam currently wraps) and rearranges them to correspond to the order of the C declarations in htslib/*.h for ease of future updates.