Update CHANGELOG.md

pace-neutrons · Feb 23, 2024 · c560d39 · c560d39
1 parent e4af133
commit c560d39
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,25 @@
 # [Unreleased](https://github.com/pace-neutrons/pace-python/compare/v0.2.0...HEAD)
 
 * New features
-  - Add ability to use existing Horace/SpinW rather than downloading;
-  - Check included to test provided Horace/SpinW path;
-  - Add option to exclude Horace/SpinW from build;
-  - Add option to set version/release to download;
-  - Version checking for both Horace and SpinW included;
-  - Inclusion of libpymcr enabling use of previously incompatible Matlab and Python versions.
+  - Add ability to use existing Horace/SpinW rather than downloading
+  - Check included to test provided Horace/SpinW path
+  - Add option to exclude Horace/SpinW from build
+  - Add option to set version/release to download
+  - Version checking for both Horace and SpinW included
+  - Inclusion of libpymcr enabling use of previously incompatible Matlab and Python versions
+  - IPythonMagics module moved to [libpymcr](https://pypi.org/project/libpymcr/).
+
+* For developers (CI changes)
+  - Update to use PACE-shared-lib
+  - Add parametrised pipeline
+  - Update for use with rocky8 and icdpacewin
+  - Use conda environments throughout
+  - Remove podman usage
+  - Introduce seperate build installer stage
+  - Remove reliance on external powershell and bash scripts
+
+* Notes
+  - Brille test currently disabled (see #28)
 
 # [v0.2.0](https://github.com/pace-neutrons/pace-python/compare/v0.1.4...v0.2.0)
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,14 +48,6 @@ elseif(WITH_SPINW AND NOT SPINW_PATH AND NOT DEFINED SPINW_VERSION)
     set(SPINW_VERSION e3e57aae432f6737aff81d31ccda6e7dce741cef CACHE STRING "Sets the SpinW version (git tag/branch/hash) to download")
 endif()
 
-    message(STATUS "SPINW_FOUND variable contains ${SPINW_FOUND}")
-
-    if(NOT SPINW_FOUND)
-        message(FATAL_ERROR "SpinW may not exist at ${SPINW_PATH}") #TODO: write a better message
-    # else()
-    #     message(FATAL_ERROR "SpinW was found.")
-    endif()
-endif()
 
 if(WIN32)
     find_package(POWERSHELL REQUIRED)

diff --git a/cmake/PACE.cmake b/cmake/PACE.cmake
@@ -91,72 +91,6 @@ if(WITH_HORACE)
             INSTALL_COMMAND ""
             TEST_COMMAND ""
         )
-
-        # download(
-        #     PROJ SPINW
-        #     GIT_REPOSITORY https://github.com/${SPINW_REPO}.git
-        #     GIT_TAG ${SPINW_VERSION}
-        #     GIT_SHALLOW 1
-        #     SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/CTF" 
-        #)
-    endif()
-
-else()
-    message(STATUS "Horace not included")
-endif()
-
-#removes unecessary files to avoid associated errors during build
-if(WITH_HORACE AND HORACE_PATH)
-    add_custom_command(
-        TARGET horace POST_BUILD
-        COMMENT "@testsigvar"
-        COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/CTF/Horace/herbert_core/utilities/classes/@testsigvar"
-    )
-endif()
-
-if(WITH_HORACE)
-    if(HORACE_PATH)
-        #Searches for the horace_version.m file to check whether horace can be found in the provided dir
-        #ISSUE: different horace versions may have different dir structure  
-        find_file(HORACE_FOUND 
-            NAMES "horace_version.m"
-            PATHS "${HORACE_PATH}/horace_core/admin"
-            NO_CACHE
-            )
-
-        if(NOT HORACE_FOUND)
-            message(FATAL_ERROR "Horace may not exist at ${HORACE_PATH}") #TODO: write a better message
-        endif()
-        message(STATUS "Horace found: ${HORACE_PATH}")
-
-        #includes the located version of Horace in the current project
-        ExternalProject_Add(horace 
-            SOURCE_DIR ${HORACE_PATH}
-            DOWNLOAD_COMMAND "" #empty quotation marks effectively disables the download feature of ExternalProject_Add
-            CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/CTF"
-            )
-
-    else()
-
-        #downloads desired Horace version suitable for the users OS
-        if(WIN32)
-            set(HORACE_TYPE "win64")
-        else()
-            set(HORACE_TYPE "linux")
-            set(FILE_EXTENSION "tar.gz")
-        endif()
-
-        message(STATUS "Downloading Horace from https://github.com/pace-neutrons/Horace/releases/download/v${HORACE_VERSION}/Horace-${HORACE_VERSION}-${HORACE_TYPE}-R2019b.zip")
-        ExternalProject_Add(horace
-            URL https://github.com/pace-neutrons/Horace/releases/download/v${HORACE_VERSION}/Horace-${HORACE_VERSION}-${HORACE_TYPE}-R2019b.${FILE_EXTENSION}
-            BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/CTF"
-            SOURCE_DIR 
-            CONFIGURE_COMMAND ""
-            BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/Horace <BINARY_DIR>/Horace
-                   COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/Herbert <BINARY_DIR>/Herbert
-            INSTALL_COMMAND ""
-            TEST_COMMAND ""
-        )
     endif()
 
 else()