From 092026cce9fbcb6ec53540d78240681dc91878f3 Mon Sep 17 00:00:00 2001
From: Andre Offringa <offringa@astron.nl>
Date: Tue, 18 Jun 2024 09:30:18 +0000
Subject: [PATCH] Prepare changelog and version info for 6.1 release

---
 CHANGELOG.md         | 22 ++++++++++++++++++----
 CMakeLists.txt       |  3 ++-
 CPack/CMakeLists.txt |  2 +-
 setup.py             |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ba42540c..9e6233833 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,23 @@
 # DP3 Changelog
 
-## Next release
-
-### Improvements
-- DP3 now requires EveryBeam v0.5.8
+## [6.1] - 2024-06-18
+
+- Support EveryBeam 0.6 (in addition to EveryBeam 0.5.8)
+- Faster beam predict by using cached time directions
+- Add support for dish telescopes like SKA-mid
+- Add preliminary clipper task for VLBI processing
+- Reduce memory in predict step
+- Read sky model only once to speed up processing
+- Various AARTFAAC processing improvements
+- More use of XTensor
+- Some use of AVX(2) instructions to speed up tasks
+- Improve threading and use of threadpool
+- Fix wrong h5 time axis when solint larger than number
+- Fix prediction for source models with only negative polarized sources
+- Fix compilation on platforms where size_t != 64 bit
+- Fix multiple baseline selection (!1255)
+- Fix ApplyCal with full-Jones correction
+- Various small bugs and code improvements
 
 ## [6.0] - 2023-08-11
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fe7d6224..c0fe1df8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,8 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19")
 endif()
 
 # Set version number and project name.
-set(DP3_VERSION 6.0.0)
+# Please keep CPack/CMakeLists.txt and setup.py in sync with this.
+set(DP3_VERSION 6.1.0)
 if(DP3_VERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)")
   set(DP3_VERSION_MAJOR "${CMAKE_MATCH_1}")
   set(DP3_VERSION_MINOR "${CMAKE_MATCH_2}")
diff --git a/CPack/CMakeLists.txt b/CPack/CMakeLists.txt
index af68451a7..d49263085 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.5.4), everybeam (<< 0.6.0),\
+ everybeam (>= 0.5.8), everybeam (<< 0.7.0),\
  idg-api (>= 0.8)")
 set(CPACK_DEBIAN_PACKAGE_MAINTAINER "deb-packages@astron.nl")
 set(CPACK_DEBIAN_PACKAGE_SECTION "science")
diff --git a/setup.py b/setup.py
index 4a1b37ed8..784de04f8 100755
--- a/setup.py
+++ b/setup.py
@@ -111,7 +111,7 @@ class CMakeBuild(build_ext):
 # logic and declaration, and simpler if you include description/version in a file.
 setup(
     name="DP3",
-    version="6.0.1",
+    version="6.1.0",
     author="Astron",
     author_email="dijkema@astron.nl",
     description="DP3",
-- 
GitLab