Skip to content

Commit

Permalink
fix: update noodles
Browse files Browse the repository at this point in the history
  • Loading branch information
tshauck committed Apr 19, 2024
1 parent 9653915 commit 02ee191
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 28 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ arrow = { version = "51.0.0" }
async-trait = "0.1.80"
datafusion = { version = "37", features = ["compression", "parquet"] }
futures = "0.3"
noodles = { version = "0.68" }
noodles = { version = "0.69" }
object_store = { version = "0.9" }
tokio = { version = "1", features = ["io-util"] }
tokio-util = { version = "0.7.10", features = ["compat"] }
Expand Down
20 changes: 1 addition & 19 deletions exon/exon-bcf/src/batch_reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ where
/// Configuration for how to batch records.
config: Arc<BCFConfig>,

/// The VCF header.
/// The header.
header: Arc<noodles::vcf::Header>,
// The VCF header string maps.
// string_maps: noodles::bcf::header::StringMaps,
}

impl<R> BatchReader<R>
Expand All @@ -47,22 +45,6 @@ where
// reader.read_file_format().await?;

let header = reader.read_header().await?;
// let header = header_str.parse::<noodles::vcf::Header>().map_err(|e| {
// std::io::Error::new(
// std::io::ErrorKind::InvalidData,
// format!("invalid header: {e}"),
// )
// })?;

// let string_maps = match header_str.parse() {
// Ok(string_maps) => string_maps,
// Err(e) => {
// return Err(std::io::Error::new(
// std::io::ErrorKind::InvalidData,
// format!("invalid header: {e}"),
// ))
// }
// };

Ok(Self {
reader,
Expand Down
7 changes: 5 additions & 2 deletions exon/exon-core/src/datasources/bigwig/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

pub(crate) mod value;
pub(crate) mod zoom;
/// Module to work with BigWig files.
pub mod value;

/// Module to work with BigWig files with a zoom level.
pub mod zoom;
8 changes: 8 additions & 0 deletions exon/exon-core/src/datasources/vcf/table_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,14 @@ impl ListingVCFTableOptions {
}
}

/// Set the file extension
pub fn with_file_extension(self, file_extension: String) -> Self {
Self {
file_extension,
..self
}
}

/// Set the table partition columns
pub fn with_table_partition_cols(self, table_partition_cols: Vec<Field>) -> Self {
Self {
Expand Down

0 comments on commit 02ee191

Please sign in to comment.