Skip to content

Commit af54dd1

Browse files
authored
v0.16.0 - Van vleck, msrv 1.65, mwalib 1.8.2, marlu 0.15
Van Vleck corrections * msrv 1.65, mwalib 1.8.2, marlu 0.15, ndarray 0.16, fitsio0.21.6 * don't correct flagged ants. comment out cheby corrections * tests comparing with pyuvdata * read bscale from mwalib MWATelescope/mwalib#85 * stop iterating for sigma < 0.5 * --no-geom conflicts with --pointing-centre and --phase-centre * warnings for bad kappa * error message on non-legacy obs * fix macos ci install deps
1 parent cef77d2 commit af54dd1

24 files changed

+5614
-170
lines changed

.github/workflows/macos_ci.yml

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,23 @@ jobs:
3333
uses: davidB/rust-cargo-make@v1
3434
- name: Install Dependencies
3535
run: |
36-
# cargo make install_deps # doesn't work
37-
brew install casacore/tap/casacore mwatelescope/tap/aoflagger
36+
# cargo make install_deps
37+
# doesn't work on macos, brew install ... says you need arch -arm64 brew ...
38+
# but there's no way to distinguish between macos-13 and macos-14
39+
# using uname -m or arch
40+
# https://github.com/actions/runner-images/issues/9471#issuecomment-1992603303
41+
for f in $(find /usr/local/bin -type l -print); do \
42+
(readlink $f | grep -q -s "/Library") && echo Removing "$f" && rm -f "$f"; \
43+
done
44+
INSTALL="brew install"
45+
[ "${{ matrix.os }}" == "macos-14" ] && INSTALL="arch -arm64 brew install"
46+
$INSTALL mwatelescope/tap/aoflagger
47+
echo "DYLD_FALLBACK_LIBRARY_PATH=$(brew --prefix)/lib/" >> $GITHUB_ENV
48+
echo "AOFLAGGER_LIB=$(brew --prefix)/lib/" >> $GITHUB_ENV
49+
echo "AOFLAGGER_INCLUDE_DIR=$(brew --prefix)/include/" >> $GITHUB_ENV
50+
echo "PKG_CONFIG_PATH=$(brew --prefix)/lib/pkgconfig/" >> $GITHUB_ENV
3851
- name: Run tests
3952
run: |
4053
cargo make test_no_default
4154
cargo make test_no_flag
4255
cargo make test
43-
env:
44-
DYLD_FALLBACK_LIBRARY_PATH: /opt/homebrew/lib/
45-
AOFLAGGER_LIB: /opt/homebrew/lib/
46-
AOFLAGGER_INCLUDE_DIR: /opt/homebrew/include/

Cargo.lock

Lines changed: 105 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "birli"
33
description = "A preprocessing pipeline for the Murchison Widefield Array"
4-
version = "0.15.1"
4+
version = "0.16.0"
55
readme = "README.md"
66
homepage = "https://github.com/MWATelescope/Birli"
77
repository = "https://github.com/MWATelescope/Birli"
@@ -12,7 +12,7 @@ authors = [
1212
"Luke A. Williams <luke.a.williams@curtin.edu.au>",
1313
]
1414
edition = "2021"
15-
rust-version = "1.64"
15+
rust-version = "1.65"
1616
license = "MPL-2.0"
1717
keywords = ["radioastronomy", "mwa", "astronomy", "aoflagger", "cotter"]
1818
categories = ["science", "parsing"]
@@ -43,9 +43,11 @@ indicatif = { version = "0.17.0", features = ["rayon"] }
4343
itertools = "0.10.0"
4444
lazy_static = "1.4.0"
4545
log = "0.4.0"
46-
marlu = "0.14.0"
46+
marlu = "0.15.0"
4747
regex = "1.4.0"
4848
thiserror = "1.0.0"
49+
errorfunctions = "0.2.0"
50+
serde-pickle = "1.1.1"
4951

5052
# aoflagger feature
5153
aoflagger_sys = { version = "0.1.2", optional = true }
@@ -64,7 +66,7 @@ csv = "1.1"
6466
float-cmp = "0.9"
6567
glob = "0.3"
6668
lexical = "6.0"
67-
marlu = { version = "0.14.0", features = ["approx"] }
69+
marlu = { version = "0.15.0", features = ["approx"] }
6870
ndarray = { version = "0.16.0", features = ["approx"] }
6971
tempfile = "3.3"
7072

@@ -91,6 +93,10 @@ opt-level = 3
9193

9294
[patch.crates-io]
9395
# marlu = { path = "../Marlu" }
94-
# marlu = { git = "https://github.com/MWATelescope/Marlu", branch = "birli-150" }
96+
# marlu = { git = "https://github.com/MWATelescope/Marlu", branch = "mwalib-1.8.0" }
9597
# mwalib = { path = "../mwalib" }
96-
# mwalib = { git = "https://github.com/MWATelescope/mwalib", branch = "digital_gains_plus" }
98+
# mwalib = { git = "https://github.com/MWATelescope/mwalib", branch = "pyo3_stub_chrono_fix" }
99+
# aoflagger_sys = { git = "https://github.com/MWATelescope/rust-aoflagger", branch = "sonoma-fix" }
100+
101+
# TODO: update to cxx 1.0.129 when MSRV >= 1.67
102+
url = { git = "https://github.com/servo/rust-url", tag = "v2.5.2" }

Makefile.toml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,13 @@ dependencies = ["linux_install_aoflagger"]
124124

125125
[tasks.mac_install_deps]
126126
script = """
127-
brew install casacore/tap/casacore mwatelescope/tap/aoflagger
127+
INSTALL="brew install"
128+
# in github actions runners:
129+
# - macos-13: uname -m => x86_64, arch => i386
130+
# - macos-14: uname -m => x86_64, arch => i386
131+
# but macos-14 should be arm64 ?
132+
# in that case, we want INSTALL="arch -arm64 $INSTALL" apparently?
133+
$INSTALL mwatelescope/tap/aoflagger
128134
"""
129135

130136
[tasks.install_deps]
@@ -200,6 +206,10 @@ args = ["test", "--no-default-features", "--release"]
200206
command = "cargo"
201207
args = ["test", "--no-default-features", "--release", "--features=cli"]
202208

209+
[tasks.test_package]
210+
command = "cargo"
211+
args = ["package", "--allow-dirty"]
212+
203213
[tasks.ci]
204214
dependencies = [
205215
"clean",
@@ -219,4 +229,5 @@ dependencies = [
219229
"test_no_default",
220230
"test",
221231
"rustdoc",
232+
"test_package",
222233
]

0 commit comments

Comments
 (0)