!PATCHED! update marlu0.15 mwalib1.8 fitsio0.21.6

- FitsFile.file_path()
- no CFITSIO_VERSION

Cargo.toml

@@ -43,7 +43,7 @@ indicatif = { version = "0.17.0", features = ["rayon"] }
 itertools = "0.10.0"
 lazy_static = "1.4.0"
 log = "0.4.0"
-marlu = "0.14.0"
+marlu = "0.15.0"
 regex = "1.4.0"
 thiserror = "1.0.0"
 errorfunctions = "0.2.0"
@@ -66,7 +66,7 @@ csv = "1.1"
 float-cmp = "0.9"
 glob = "0.3"
 lexical = "6.0"
-marlu = { version = "0.14.0", features = ["approx"] }
+marlu = { version = "0.15.0", features = ["approx"] }
 ndarray = { version = "0.16.0", features = ["approx"] }
 tempfile = "3.3"
 
@@ -93,7 +93,7 @@ opt-level = 3
 
 [patch.crates-io]
 # marlu = { path = "../Marlu" }
-# marlu = { git = "https://github.com/MWATelescope/Marlu", branch = "birli-150" }
+marlu = { git = "https://github.com/MWATelescope/Marlu", branch = "mwalib-1.8.0" }
 # mwalib = { path = "../mwalib" }
-# mwalib = { git = "https://github.com/MWATelescope/mwalib", branch = "digital_gains_plus" }
+mwalib = { git = "https://github.com/MWATelescope/mwalib", branch = "pyo3_stub_chrono_fix" }
 # aoflagger_sys = { git = "https://github.com/MWATelescope/rust-aoflagger", branch = "sonoma-fix" }

src/cli.rs

@@ -13,8 +13,8 @@ use indicatif::{ProgressDrawTarget, ProgressStyle};
 use itertools::{izip, Itertools};
 use log::{debug, info, trace, warn};
 use mwalib::{
-    built_info::PKG_VERSION as MWALIB_PKG_VERSION, fitsio_sys::CFITSIO_VERSION, CableDelaysApplied,
-    CorrelatorContext, GeometricDelaysApplied, MWAVersion,
+    built_info::PKG_VERSION as MWALIB_PKG_VERSION, CableDelaysApplied, CorrelatorContext,
+    GeometricDelaysApplied, MWAVersion,
 };
 use prettytable::{format as prettyformat, row, table};
 
@@ -98,7 +98,6 @@ pub fn fmt_build_info(f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
     writeln!(f, "libraries:")?;
     writeln!(f, "- marlu v{MARLU_PKG_VERSION}")?;
     writeln!(f, "- mwalib v{MWALIB_PKG_VERSION}")?;
-    writeln!(f, "- cfitsio (bindings) v{CFITSIO_VERSION}")?;
 
     cfg_if! {
         if #[cfg(feature = "aoflagger")] {

src/io/mwaf.rs

@@ -13,10 +13,13 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use fitsio::{tables::ColumnDataType, tables::ColumnDescription, FitsFile};
 use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget, ProgressStyle};
 use itertools::Itertools;
-use marlu::{fitsio, fitsio_sys, mwalib, ndarray, rayon, VisSelection};
+use marlu::{
+    fitsio,
+    fitsio::{tables::ColumnDataType, tables::ColumnDescription, FitsFile},
+    fitsio_sys, mwalib, ndarray, rayon, VisSelection,
+};
 use mwalib::{
     CorrelatorContext, MWAVersion, _get_required_fits_key, _open_hdu, fits_open_hdu,
     get_required_fits_key,
@@ -476,7 +479,7 @@ impl FlagFileSet {
 
                 fitsio::errors::check_status(status).map_err(|e| FitsIO {
                     fits_error: e,
-                    fits_filename: fptr.filename.clone(),
+                    fits_filename: fptr.file_path().to_path_buf(),
                     hdu_num: 2,
                     source_file: file!(),
                     source_line: line!(),
@@ -659,7 +662,7 @@ impl FlagFileSet {
         if header.num_rows != header.num_timesteps * baselines {
             return Err(ReadMwafError::Generic(format!(
                 "File {:?}: Expected NSCANS * NANTENNA * (NANTENNA+1) / 2 = NAXIS2, found {} * {} != {}",
-                fptr.filename,
+                fptr.file_path(),
                 header.num_timesteps, baselines, header.num_rows
             )));
         }
@@ -834,7 +837,7 @@ impl FlagFileSet {
                 }
                 fitsio::errors::check_status(status).map_err(|e| FitsIO {
                     fits_error: e,
-                    fits_filename: fptr.filename.clone(),
+                    fits_filename: fptr.file_path().to_path_buf(),
                     hdu_num: 1,
                     source_file: file!(),
                     source_line: line!(),