Merge pull request #1083 from slaclab/pre-release

Release Candidate v6.7.0

Author: ruck314

.github/workflows/rogue_ci.yml

@@ -12,7 +12,6 @@
 # The following environment variables are required for this process:
 # secrets.GH_TOKEN
 # secrets.CONDA_UPLOAD_TOKEN_TAG
-# secrets.DOCKERHUB_TOKEN
 
 name: Rogue Integration
 on: [push]
@@ -55,18 +54,10 @@ jobs:
             exit 1
           fi
 
-      # Python Linter
-      - name: Python Linter
+      # Run Linters
+      - name: Python and C++ Linters
         run: |
-          python -m compileall -f ./python/
-          flake8 --count ./python/
-          python -m compileall -f ./tests
-          flake8 --count ./tests/
-
-      # C++ Linter
-      - name: C++ Linter
-        run: |
-          find . -name '*.h' -o -name '*.cpp' | xargs cpplint
+          ./scripts/run_linters.sh
 
       # Rogue
       - name: Build Rogue

.gitignore

@@ -22,3 +22,4 @@ bld-dir/*
 /linuxRT-x86_64
 /rhel6-x86_64
 /rhel7-x86_64
+rogue.egg-info*

CMakeLists.txt

@@ -73,30 +73,30 @@ if ( NOT NO_PYTHON )
    endif()
 
    # libboost_python3.7 style libraries
-   message("Looking for libboost_python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
+   message("Looking for libboost_python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} Mode 1")
    FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
 
    # libboost_python3 style libraries
    if (NOT Boost_FOUND)
-      message("Looking for libboost_python${Python3_VERSION_MAJOR}")
+      message("Looking for libboost_python${Python3_VERSION_MAJOR} Mode 2")
       FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS python${Python3_VERSION_MAJOR})
    endif()
 
    # libboost_python style libraries
    if (NOT Boost_FOUND)
-      message("Looking for libboost_python")
+      message("Looking for libboost_python Mode 3")
       FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS system thread python)
    endif()
 
    # libboost_python-py37 style libraries
    if (NOT Boost_FOUND)
-      message("Looking for libboost_python-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
+      message("Looking for libboost_python-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} Mode 4")
       FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS python-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
    endif()
 
    # libboost_python3-py37 style libraries
    if (NOT Boost_FOUND)
-      message("Looking for libboost_python3-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}")
+      message("Looking for libboost_python3-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} Mode 5")
       FIND_PACKAGE(Boost 1.58 QUIET COMPONENTS python3-py${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
    endif()
 
@@ -236,7 +236,6 @@ include_directories(system ${Python3_INCLUDE_DIRS})
 include_directories(system ${Python3_NumPy_INCLUDE_DIRS})
 include_directories(system ${ZeroMQ_INCLUDE_DIR})
 include_directories(system ${BZIP2_INCLUDE_DIR})
-include_directories(system ${EPICS_INCLUDES})
 
 if (APPLE)
    SET(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
@@ -259,7 +258,6 @@ set_target_properties(rogue-core-shared PROPERTIES VERSION ${ROGUE_VERSION} SOVE
 
 TARGET_LINK_LIBRARIES(rogue-core-shared PUBLIC ${Boost_LIBRARIES})
 TARGET_LINK_LIBRARIES(rogue-core-shared PUBLIC ${ZeroMQ_LIBRARY})
-TARGET_LINK_LIBRARIES(rogue-core-shared PUBLIC ${EPICS_LIBRARIES})
 TARGET_LINK_LIBRARIES(rogue-core-shared PUBLIC ${BZIP2_LIBRARIES})
 
 # Do not link directly against python in mac os
@@ -278,7 +276,6 @@ if(STATIC_LIB)
     # Link rogue core to boost, python and bzip
     TARGET_LINK_LIBRARIES(rogue-core-static PUBLIC ${Boost_LIBRARIES})
     TARGET_LINK_LIBRARIES(rogue-core-static PUBLIC ${ZeroMQ_LIBRARY})
-    TARGET_LINK_LIBRARIES(rogue-core-static PUBLIC ${EPICS_LIBRARIES})
     TARGET_LINK_LIBRARIES(rogue-core-static PUBLIC ${BZIP2_LIBRARIES})
     TARGET_LINK_LIBRARIES(rogue-core-static PUBLIC ${Python3_LIBRARIES})
     TARGET_LINK_LIBRARIES(rogue-core-static PUBLIC rt)

buildroot-2019.08-x86_64.cmake

@@ -5,20 +5,13 @@ python:
   - 3.11
   - 3.12
 
-# Use NumPy minors that exist for each Python
-numpy:
-  - 1.26    # py39
-  - 1.26    # py310
-  - 1.26    # py311
-  - 1.26    # py312
-
 ###############################################################################################
 # Notes for checking if conda solution exist before doing the actual conda build
 ###############################################################################################
-# conda render conda-recipe --variants "{python: 3.9,  numpy: 1.26, python_abi: '3.9  *_cp39' }"
-# conda render conda-recipe --variants "{python: 3.10, numpy: 1.26, python_abi: '3.10 *_cp310'}"
-# conda render conda-recipe --variants "{python: 3.11, numpy: 1.26, python_abi: '3.11 *_cp311'}"
-# conda render conda-recipe --variants "{python: 3.12, numpy: 1.26, python_abi: '3.12 *_cp312'}"
+# conda render conda-recipe --variants "{python: 3.9,  python_abi: '3.9  *_cp39' }"
+# conda render conda-recipe --variants "{python: 3.10, python_abi: '3.10 *_cp310'}"
+# conda render conda-recipe --variants "{python: 3.11, python_abi: '3.11 *_cp311'}"
+# conda render conda-recipe --variants "{python: 3.12, python_abi: '3.12 *_cp312'}"
 ###############################################################################################
 
 # Lock to CPython ABI, not PyPy
@@ -35,7 +28,7 @@ python_impl:
   - cpython   # py312
 
 zip_keys:
-  - [python, numpy, python_abi, python_impl]
+  - [python, python_abi, python_impl]
 
 pin_run_as_build:
   python: {min_pin: x.x, max_pin: x.x}

buildroot-2019.08-x86_64_cmake.sh

@@ -20,13 +20,13 @@ requirements:
      - bzip2
      - zeromq
      - python {{ python }} # declare python variants in conda_build_config.yaml
-     - numpy {{ numpy }}   # declare numpy  variants in conda_build_config.yaml
+     - numpy>=2.0
    run:
      - python
      - boost
      - bzip2
      - zeromq
-     - numpy
+     - numpy>=2.0
      - ipython
      - pyyaml
      - jsonpickle

conda-recipe/conda_build_config.yaml

@@ -29,7 +29,6 @@ RUN mkdir build
 WORKDIR build
 RUN cmake .. -DROGUE_INSTALL=system
 RUN make -j4 install
-RUN echo /usr/local/lib >> /etc/ld.so.conf.d/rogue_epics.conf
 RUN ldconfig
 ENV PYQTDESIGNERPATH /usr/local/lib/python3.10/dist-packages/pyrogue/pydm
 ENV PYDM_DATA_PLUGINS_PATH /usr/local/lib/python3.10/dist-packages/pyrogue/pydm/data_plugins

conda-recipe/meta.yaml

@@ -4,7 +4,7 @@
 Installing Rogue Docker
 =======================
 
-Docker images with rogue are automatically generated and uploaded to Docker hub, in the following repositories:
+Docker images with rogue are automatically generated and uploaded to GitHub Container Registry (GHCR), in the following repositories:
 
 Docker images are created for tagged version of rogue:
 https://ghcr.io/slaclab/rogue

docker/rogue/Dockerfile

@@ -62,7 +62,7 @@ Once the rogue environment is activated, you can build and install rogue
    $ mkdir build
    $ cd build
    $ cmake ..
-   $ make
+   $ make -j$(nproc)
    $ make install
 
 The Rogue build system will automatically detect that it is in a conda environment and it will be installed