Revert "Merge branch 'develop' into features/async-restart"

This reverts commit a418010, reversing
changes made to 5d628ac.

Author: koparasy

.github/containers/x86_64-gcc.12.2-mariadb-flux/Dockerfile

@@ -390,7 +390,7 @@ jobs:
             -DWITH_ADIAK=Off \
             $GITHUB_WORKSPACE
             make
-  
+
   build-rmq-tests:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
@@ -536,4 +536,3 @@ jobs:
           source /venv/bin/activate
           python -m unittest discover -s tests/AMSWorkflow -p "test_*.py" -v
 
-

.github/containers/x86_64-gcc.12.2-mariadb-flux/init.sql

@@ -10,8 +10,7 @@ jobs:
       matrix:
         target: [
           { context: "x86_64-broadwell-gcc11.2.1", tag: "ams-ci-almalinux8" },
-          { context: "x86_64-broadwell-cuda11.6.1", tag: "ams-ci-cuda11.6.1" },
-          { context: "x86_64-gcc.12.2-mariadb-flux", tag: "ams-ci-flux-mariadb" }
+          { context: "x86_64-broadwell-cuda11.6.1", tag: "ams-ci-cuda11.6.1" }
         ]
     steps:
       - name: Set up QEMU
@@ -41,7 +40,7 @@ jobs:
           sudo docker image prune --all --force
           sudo rm -rf "$AGENT_TOOLSDIRECTORY"
 
-      - name: Build and push container
+      - name: Build and push almalinux8 container
         uses: docker/build-push-action@v6
         with:
           platforms: linux/amd64

.github/workflows/ci.yml

@@ -138,12 +138,10 @@ if (WITH_HDF5)
   find_package(HDF5 NAMES hdf5 COMPONENTS C static NO_DEFAULT_PATH PATHS ${AMS_HDF5_DIR} ${AMS_HDF5_DIR}/share/cmake)
   list(APPEND AMS_APP_LIBRARIES ${HDF5_C_STATIC_LIBRARY})
   message(STATUS "HDF5 Static Library : ${HDF5_C_STATIC_LIBRARY}")
-  set(AMS_HDF5_LIB_TYPE "static")
 else()
   find_package(HDF5 NAMES hdf5 COMPONENTS C shared NO_DEFAULT_PATH PATHS ${AMS_HDF5_DIR} ${AMS_HDF5_DIR}/share/cmake)
   list(APPEND AMS_APP_LIBRARIES ${HDF5_C_SHARED_LIBRARY})
   message(STATUS "HDF5 Shared Library : ${HDF5_C_SHARED_LIBRARY}")
-  set(AMS_HDF5_LIB_TYPE "shared")
 endif()
   list(APPEND AMS_APP_INCLUDES ${HDF5_INCLUDE_DIR})
   list(APPEND AMS_APP_DEFINES "-D__ENABLE_HDF5__")
@@ -161,13 +159,10 @@ if (WITH_RMQ)
   list(APPEND AMS_APP_INCLUDES ${amqpcpp_INCLUDE_DIR})
 
   find_package(OpenSSL REQUIRED)
-  set(AMS_OPENSSL_FOUND_ROOT "")
   if (OPENSSL_FOUND)
     list(APPEND AMS_APP_INCLUDES ${OPENSSL_INCLUDE_DIR})
     list(APPEND AMS_APP_LIBRARIES "${OPENSSL_LIBRARIES}")
     list(APPEND AMS_APP_LIBRARIES ssl)
-    get_filename_component(AMS_OPENSSL_FOUND_ROOT "${OPENSSL_SSL_LIBRARY}" DIRECTORY)
-    get_filename_component(AMS_OPENSSL_FOUND_ROOT "${AMS_OPENSSL_FOUND_ROOT}" DIRECTORY)
     message(STATUS "OpenSSL includes found: " ${OPENSSL_INCLUDE_DIR})
     message(STATUS "OpenSSL libraries found: " ${OPENSSL_LIBRARIES})
   else()
@@ -180,6 +175,7 @@ if (WITH_RMQ)
   list(APPEND AMS_APP_LIBRARIES amqpcpp event_pthreads event)
 endif() # WITH_RMQ
 
+# ------------------------------------------------------------------------------
 if(NOT DEFINED UMPIRE_DIR)
   message(FATAL_ERROR "Missing required 'UMPIRE_DIR' variable pointing to an installed Umpire ${UMPIRE_DIR}")
 endif()
@@ -190,7 +186,6 @@ find_package(UMPIRE REQUIRED
 list(APPEND AMS_APP_LIBRARIES umpire)
 list(APPEND AMS_APP_INCLUDES ${UMPIRE_INCLUDE_DIR})
 
-# ------------------------------------------------------------------------------
 find_package(nlohmann_json REQUIRED)
 list(APPEND AMS_APP_LIBRARIES nlohmann_json::nlohmann_json)
 

.github/workflows/create-containers.yml

@@ -32,10 +32,8 @@ classifiers = [
   "Programming Language :: Python :: 3 :: Only",
 ]
 dependencies = [
-  "h5py",
   "argparse",
-  "SQLAlchemy",
-  "mysql-connector-python",
+  "kosh>=3.0.1",
   "pika>=1.3.0",
   "numpy>=1.2.0"
 ]