Merge pull request #920 from slaclab/build_update

Update conda meta file and python install method

.github/workflows/rogue_ci.yml

@@ -240,7 +240,10 @@ jobs:
           export PATH="${HOME}/miniconda/bin:$PATH"
           source ${HOME}/miniconda/etc/profile.d/conda.sh
           conda config --set always_yes yes
+          conda config --set channel_priority strict
           conda update -n base -c conda-forge conda
+          conda install -n base conda-libmamba-solver
+          conda config --set solver libmamba
           conda install conda-build anaconda-client conda-verify
           conda update -q conda conda-build
           conda update --all

CMakeLists.txt

@@ -450,14 +450,9 @@ if (NOT NO_PYTHON)
       install(DIRECTORY ${PROJECT_SOURCE_DIR}/python/pyrogue DESTINATION ${ROGUE_DIR}/python FILES_MATCHING PATTERN "*.py")
       install(TARGETS rogue LIBRARY DESTINATION ${ROGUE_DIR}/python)
 
-   # Use setuptools with python3 for system
-   elseif (${ROGUE_INSTALL} STREQUAL "system")
-      install(CODE "execute_process(COMMAND python3 ${PROJECT_BINARY_DIR}/setup.py install)")
-
-   # Use setuptools with python for anaconda
-   elseif (${ROGUE_INSTALL} STREQUAL "conda")
-      install(CODE "execute_process(COMMAND python
-              ${PROJECT_BINARY_DIR}/setup.py install --prefix=${ROGUE_DIR})")
+   # Use pip with python3 for system or anaconda
+   elseif ((${ROGUE_INSTALL} STREQUAL "system") OR (${ROGUE_INSTALL} STREQUAL "conda"))
+      install(CODE "execute_process(COMMAND pip3 install ${PROJECT_BINARY_DIR}/)")
    endif()
 
    # Do byte compile for custom or local

conda-recipe-e3/meta.yaml

@@ -10,33 +10,24 @@ build:
 
 requirements:
    build:
-     - python<3.8
-     - boost
      - {{ compiler('c') }}
      - {{ compiler('cxx') }}
      - git
      - cmake
      - make
-     - bzip2
-     - zeromq
-     - epics-base
-     - pcas
-     - numpy
    host:
-     - python<3.8
+     - python
      - boost
      - bzip2
      - zeromq
+     - numpy
      - epics-base
      - pcas
-     - numpy
    run:
-     - python<3.8
+     - python
      - boost
      - bzip2
      - zeromq
-     - epics-base
-     - pcas
      - numpy
      - ipython
      - p4p
@@ -45,11 +36,12 @@ requirements:
      - pyzmq
      - parse
      - click
-     - pyqt
      - sqlalchemy
      - pydm>=1.18.0
      - pyserial
      - matplotlib
+     - epics-base
+     - pcas
 
 about:
    home: https://github.com/slaclab/rogue

conda-recipe/meta.yaml

@@ -10,16 +10,11 @@ build:
 
 requirements:
    build:
-     - python
-     - boost
      - {{ compiler('c') }}
      - {{ compiler('cxx') }}
      - git
      - cmake
      - make
-     - bzip2
-     - zeromq
-     - numpy
    host:
      - python
      - boost
@@ -39,7 +34,6 @@ requirements:
      - pyzmq
      - parse
      - click
-     - pyqt
      - sqlalchemy
      - pydm>=1.18.0
      - pyserial

conda.yml

@@ -1,5 +1,4 @@
 channels:
-  - tidair-packages
   - conda-forge
 dependencies:
   - python

templates/setup.py.in

@@ -15,7 +15,7 @@
 # contained in the LICENSE.txt file.
 # ----------------------------------------------------------------------------
 
-from distutils.core import setup
+from setuptools import setup
 
 rawVersion = '${ROGUE_VERSION}'