Merge pull request #716 from kordejong/gh627

Release LUE 0.3.8
computationalgeography · Aug 29, 2024 · 8da4905 · 8da4905
2 parents 1ca4a65 + 5304394
commit 8da4905
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 14 deletions.
diff --git a/.github/actions/install_hpx/action.yaml b/.github/actions/install_hpx/action.yaml
@@ -39,6 +39,10 @@ runs:
       if: ${{ steps.cache-hpx.outputs.cache-hit != 'true' }}
       run: |
         git clone --depth 1 --branch ${{ inputs.hpx_branch }} https://github.com/STEllAR-GROUP/hpx.git ${{ inputs.source_directory }}
+
+        # Port HPX-1.10 to CMake 3.30 (see policy CMP0167)
+        sed -i'.bak' '135 s/MODULE/CONFIG/' ${{ inputs.source_directory }}/cmake/HPX_SetupBoost.cmake
+
         cp ${{ inputs.cmake_preset_file }} ${{ inputs.source_directory }}/CMakeUserPresets.json
 
         mkdir ${{ inputs.build_directory }}

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -134,7 +134,7 @@ jobs:
                       -S ${{ env.lue_source_directory }} \
                       -B ${{ env.lue_build_directory }} \
                       --preset conan-release \
-                      -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
+                      -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                       -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
                       -D LUE_BUILD_DOCUMENTATION=TRUE \
                       -D LUE_BUILD_QA=TRUE \
@@ -173,6 +173,7 @@ jobs:
                   --test-dir ${{ env.lue_build_directory }} \
                   --output-on-failure \
                   --exclude-regex algorithm_image_land_integrate_test \
+                  --exclude-regex algorithm_image_land_integrate_and_allocate_test \
                   --exclude-regex lue_py_image_land_python_test
 
               # Test of runtime targets
@@ -196,6 +197,7 @@ jobs:
                   -S ${{ env.lue_consume_source_directory }} \
                   -B ${{ env.lue_consume_build_directory }} \
                   -G "Ninja" \
+                  -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                   -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
                   -D CMAKE_BUILD_TYPE=Release \
                   -D lue_ROOT=${{ env.lue_development_install_directory }} \

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -133,7 +133,7 @@ jobs:
                       -B ${{ env.lue_build_directory }} \
                       --preset conan-release \
                       -D CMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.macos_version }}.0 \
-                      -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
+                      -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                       -D LUE_BUILD_QA=TRUE \
                       -D LUE_QA_WITH_PYTHON_API=TRUE \
                       -D LUE_QA_WITH_TESTS=TRUE \
@@ -173,6 +173,7 @@ jobs:
                   --test-dir ${{ env.lue_build_directory }} \
                   --output-on-failure \
                   --exclude-regex algorithm_image_land_integrate_test \
+                  --exclude-regex algorithm_image_land_integrate_and_allocate_test \
                   --exclude-regex lue_py_image_land_python_test
 
               # Test of runtime targets
@@ -201,6 +202,7 @@ jobs:
                   -S ${{ env.lue_consume_source_directory }} \
                   -B ${{ env.lue_consume_build_directory }} \
                   -G "Ninja" \
+                  -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                   -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
                   -D CMAKE_BUILD_TYPE=Release \
                   -D lue_ROOT=${{ env.lue_development_install_directory }} \

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -108,7 +108,7 @@ jobs:
             #       C:\Users\runneradmin\miniconda3\envs\test/Library
             #     Invalid character escape '\U'.
             # HPX install logic needs to be updated, similar to how Boost_ROOT is handled
-            cmake_flags: "-D CMAKE_POLICY_DEFAULT_CMP0167=OLD -D CMAKE_POLICY_DEFAULT_CMP0169=OLD -D Boost_ROOT=$CONDA_PREFIX/Library -D Hwloc_ROOT=C:/Users/runneradmin/miniconda3/envs/test/Library -D Hwloc_LIBRARY=$CONDA_PREFIX/Library/lib/hwloc.lib"
+            cmake_flags: "-D Boost_ROOT=$CONDA_PREFIX/Library -D Hwloc_ROOT=C:/Users/runneradmin/miniconda3/envs/test/Library -D Hwloc_LIBRARY=$CONDA_PREFIX/Library/lib/hwloc.lib"
             hpx_branch: ${{ env.hpx_branch }}
             source_directory: ${{ env.hpx_source_directory }}
             build_directory: ${{ env.hpx_build_directory }}
@@ -150,8 +150,7 @@ jobs:
                       -S ${{ env.lue_source_directory }} \
                       -B ${{ env.lue_build_directory }} \
                       --preset conan-release \
-                      -D CMAKE_POLICY_DEFAULT_CMP0167=OLD \
-                      -D CMAKE_POLICY_DEFAULT_CMP0169=OLD \
+                      -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                       -D LUE_BUILD_QA=TRUE \
                       -D LUE_QA_WITH_PYTHON_API=TRUE \
                       -D LUE_QA_WITH_TESTS=TRUE \
@@ -190,6 +189,7 @@ jobs:
                   --test-dir ${{ env.lue_build_directory }} \
                   --output-on-failure \
                   --exclude-regex algorithm_image_land_integrate_test \
+                  --exclude-regex algorithm_image_land_integrate_and_allocate_test \
                   --exclude-regex lue_py_image_land_python_test
 
               # Tests of runtime targets
@@ -225,6 +225,7 @@ jobs:
                   -S ${{ env.lue_consume_source_directory }} \
                   -B ${{ env.lue_consume_build_directory }} \
                   -G "Ninja" \
+                  -D CMAKE_POLICY_DEFAULT_CMP0167=NEW \
                   -D CMAKE_CXX_COMPILER=${{ matrix.compiler.cxx }} \
                   -D CMAKE_BUILD_TYPE=Release \
                   -D lue_ROOT=${{ env.lue_development_install_directory }} \

diff --git a/CMakeHPXPresets.json b/CMakeHPXPresets.json
@@ -5,6 +5,8 @@
             "name": "hpx_shared_configuration",
             "hidden": true,
             "cacheVariables": {
+                "CMAKE_POLICY_DEFAULT_CMP0167": "NEW",
+                "CMAKE_POLICY_DEFAULT_CMP0169": "OLD",
                 "HPX_USE_CMAKE_CXX_STANDARD": "TRUE",
                 "HPX_WITH_EXAMPLES": "FALSE",
                 "HPX_WITH_FETCH_ASIO": "TRUE",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(
     VERSION 3.28)
 project(LUE
-    VERSION 0.3.8
+    VERSION 0.3.9
     LANGUAGES C CXX
     DESCRIPTION "A modelling framework for simulating large geographical systems of agents and fields"
     HOMEPAGE_URL "https://github.com/computationalgeography/lue"

diff --git a/document/doc/about/release.md b/document/doc/about/release.md
@@ -2,7 +2,12 @@
 
 # Releases
 
-## 0.3.8 (WIP)
+## 0.3.9
+
+- [Full list of closed issues on Github](https://github.com/computationalgeography/lue/issues?q=is%3Aclosed+is%3Aissue+milestone%3A0.3.9+)
+
+
+## 0.3.8
 
 - [Full list of closed issues on Github](https://github.com/computationalgeography/lue/issues?q=is%3Aclosed+is%3Aissue+milestone%3A0.3.8+)
 

diff --git a/document/doc/contribute/release.md b/document/doc/contribute/release.md
@@ -8,8 +8,17 @@ can be used in publications.
 
 Checklist:
 
-- Make sure the version number in the main CMakeLists.txt is correct
-- Draft a release on Github. Currently we do not use the letter v to prefix version numbers.
+- [ ] Before the release:
+
+    - [ ] Make sure the version number in the main CMakeLists.txt is correct
+    - [ ] Make sure the releases page in the documentation is correct
+    - [ ] Draft a release on Github. Currently we do not use the letter v to prefix version numbers.
+
+- [ ] After the release:
+
+    - [ ] Bump the version number in the main CMakeLists.txt
+    - [ ] Update the releases page in the documentation
+
 
 
 ## Conda package

diff --git a/environment/cmake/lue-config.cmake.in b/environment/cmake/lue-config.cmake.in
@@ -22,7 +22,7 @@ if(LUE_HDF5_REQUIRED)
 endif()
 
 if(LUE_HPX_REQUIRED)
-    find_dependency(HPX 1.9)
+    find_dependency(HPX 1.10)
 endif()
 
 if(LUE_MDSPAN_REQUIRED)

diff --git a/environment/conda/conda_build_config.yaml b/environment/conda/conda_build_config.yaml
@@ -16,9 +16,6 @@ cxx_compiler:
 hdf5:
   - 1.14.3
 libgdal:
-  - 3.8
+  - 3.9
 python:
   - 3.11
-
-MACOSX_DEPLOYMENT_TARGET:                        # [osx]
-  - 11.0                                         # [osx and arm64]