diff --git a/CHANGELOG.md b/CHANGELOG.md index e773afd2b7fdd1885e94a1b67b69a7bf8dfad3fd..a70e857dc6886d51e2f6e5bb8218d97c76f6e171 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 f17491def53c4e05f09605e5cd4a71afeece5f3d..52f50bee8accf0d479fd6e90158992170ac5f99e 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 d04d4603a10ec7dd9bcec28d5f275215f9067a3c..af68451a731cff484770e5996f7526eb62e03929 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 c00aa273c7394b61dc84454b97cab10827b586f3..aebfd701759610f68255e67b160bddec1141acd9 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 aa352bb4570a6ddf291c370cf276e9147ea47ba9..9ac805b3a182b214cc503d5c08464f7dc60c700e 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 d1d187757f9228b94471c0a82d3059150a0f15e7..76ce982c9901abd9fe5eb4453ad0579fcf6e9b28 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