Skip to content
Snippets Groups Projects
Commit 1401357d authored by Herman Groot's avatar Herman Groot
Browse files

Merge branch 'ast-1436-update-EveryBeam' into 'master'

Require EveryBeam version 0.5.4

See merge request RD/DP3!1242
parents 0cb1eea7 c2c6e277
No related branches found
No related tags found
No related merge requests found
# DP3 Changelog
## Next release
### Improvements
- DP3 now requires EveryBeam v0.5.4
## [6.0] - 2023-08-11
### New features
......
......@@ -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
......
......@@ -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")
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment