From c2c6e277326a2d7338d5238941d3d8bc56ddf3c0 Mon Sep 17 00:00:00 2001
From: Herman Groot <herman.groot@stcorp.nl>
Date: Mon, 26 Feb 2024 13:13:08 +0000
Subject: [PATCH] Require EveryBeam version 0.5.4
---
CHANGELOG.md | 5 +++++
CMakeLists.txt | 2 +-
CPack/CMakeLists.txt | 2 +-
docker/py310_wheel.docker | 2 +-
docker/ubuntu_20_04_base | 2 +-
docker/ubuntu_22_04_base | 2 +-
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e773afd2b..a70e857dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
# DP3 Changelog
+## Next release
+
+### Improvements
+- DP3 now requires EveryBeam v0.5.4
+
## [6.0] - 2023-08-11
### New features
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f17491def..52f50bee8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,7 +249,7 @@ include_directories(${AOFLAGGER_INCLUDE_DIR})
# make it somewhat more explicit
find_package(EveryBeam NO_MODULE)
if(${EVERYBEAM_FOUND})
- if(${EVERYBEAM_VERSION} VERSION_LESS "0.5.1" OR ${EVERYBEAM_VERSION}
+ if(${EVERYBEAM_VERSION} VERSION_LESS "0.5.4" OR ${EVERYBEAM_VERSION}
VERSION_GREATER_EQUAL "0.6.0")
message(
FATAL_ERROR
diff --git a/CPack/CMakeLists.txt b/CPack/CMakeLists.txt
index d04d4603a..af68451a7 100644
--- a/CPack/CMakeLists.txt
+++ b/CPack/CMakeLists.txt
@@ -45,7 +45,7 @@ set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
set(CPACK_DEBIAN_PACKAGE_DEPENDS
"aoflagger (>= 3.0.1),\
- everybeam (>= 0.4), everybeam (<< 0.5.1),\
+ everybeam (>= 0.5.4), everybeam (<< 0.6.0),\
idg-api (>= 0.8)")
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "deb-packages@astron.nl")
set(CPACK_DEBIAN_PACKAGE_SECTION "science")
diff --git a/docker/py310_wheel.docker b/docker/py310_wheel.docker
index c00aa273c..aebfd7017 100644
--- a/docker/py310_wheel.docker
+++ b/docker/py310_wheel.docker
@@ -4,7 +4,7 @@
FROM quay.io/casacore/casacore:master_wheel310
ENV AOFLAGGER_VERSION 3.2.0
-ENV EVERYBEAM_VERSION 0.5.1
+ENV EVERYBEAM_VERSION 0.5.4
ENV HDF5_VERSION 1.12.2
ENV FFTW_VERSION 3.3.8
ENV LUA_VERSION 5.3.6
diff --git a/docker/ubuntu_20_04_base b/docker/ubuntu_20_04_base
index aa352bb45..9ac805b3a 100644
--- a/docker/ubuntu_20_04_base
+++ b/docker/ubuntu_20_04_base
@@ -2,7 +2,7 @@ FROM ubuntu:20.04
# TODO: needs to be bumped before next DP3 release
# ENV IDG_VERSION=0.8
-ENV EVERYBEAM_VERSION=v0.5.1
+ENV EVERYBEAM_VERSION=v0.5.4
ENV IDG_VERSION=6b61c038883ad3f807d20047c4f9e1a1f0b8d98a
ENV AOFLAGGER_VERSION=65d5fba4f4c12797386d3fd9cd76734956a8b233
diff --git a/docker/ubuntu_22_04_base b/docker/ubuntu_22_04_base
index d1d187757..76ce982c9 100644
--- a/docker/ubuntu_22_04_base
+++ b/docker/ubuntu_22_04_base
@@ -2,7 +2,7 @@ FROM ubuntu:22.04
# TODO: needs to be bumped before next DP3 release
# ENV IDG_VERSION=0.8
-ENV EVERYBEAM_VERSION=v0.5.1
+ENV EVERYBEAM_VERSION=v0.5.4
ENV IDG_VERSION=6b61c038883ad3f807d20047c4f9e1a1f0b8d98a
ENV AOFLAGGER_VERSION=65d5fba4f4c12797386d3fd9cd76734956a8b233
--
GitLab