Skip to content

Commit

Permalink
build: Update xlsxwriter due to compilation error with older version (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
fxwiegand committed Jul 24, 2023
1 parent 9ca5f18 commit 0ffaf4d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ regex = "1.3"
tera = "1"
jsonm = "0.1.4"
chrono = "0.4"
xlsxwriter = {version = "0.3.5", features= ["use-openssl-md5", "no-md5"]}
xlsxwriter = {version = "0.6", features= ["use-openssl-md5", "no-md5"]}
lazy_static = "1.4"
anyhow = "1"
thiserror = "1"
Expand Down
4 changes: 2 additions & 2 deletions src/csv/report.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use std::io::{Read, Write};
use std::path::Path;
use std::str::FromStr;
use tera::{Context, Tera};
use xlsxwriter::*;
use xlsxwriter::prelude::*;

type LookupTable = HashMap<String, HashMap<String, Vec<(String, usize, usize)>>>;

Expand Down Expand Up @@ -127,7 +127,7 @@ pub(crate) fn csv_report(
(_, _) => {}
}

let wb = Workbook::new(&(output_path.to_owned() + "/report.xlsx"));
let wb = Workbook::new(&(output_path.to_owned() + "/report.xlsx"))?;
let mut sheet = wb.add_worksheet(Some("Report"))?;
for (i, title) in titles.iter().enumerate() {
sheet.write_string(0, i.try_into()?, title, None)?;
Expand Down

5 comments on commit 0ffaf4d

@martin-g
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fxwiegand May I ask you for a new release with this fix ?
The Bioconda build fails due to it - bioconda/bioconda-recipes#46802
If you don't plan a new release then I could apply it as a patch too!
Thank you!

@martin-g
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@fxwiegand
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/rust-bio/rust-bio-tools/releases/tag/v0.42.1 - Thanks!

No problem at all - the update on bioconda does seem to throw an error though. Would you wanna have a look into this?

@martin-g
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am looking at it at bioconda/bioconda-recipes#46802 !
I'll keep you posted !

@martin-g
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to update few dependencies to be able to build rbt on Linux ARM64: https://github.com/bioconda/bioconda-recipes/pull/46802/files#diff-95f8c720fddcb314cd6aed1a3b2bb937837e053c6d39e27fb014099bd6bdf622
I will open a PR for them!

bioconda/bioconda-recipes#46976 is a PR that just updates rbt (without enabling additional CPU architectures) and it goes well too!

Please sign in to comment.