Move some packages to a separate installation step

nsls2-conda-envs · Jul 31, 2024 · c51fa20 · c51fa20
1 parent 1ad38d5
commit c51fa20
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 33 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -83,6 +83,39 @@ jobs:
           conda config --show
           printenv | sort
 
+      - name: Add packages for py311
+        if: matrix.python-version == '3.11'
+        run: |
+          conda install -c conda-forge \
+            "bloptools>=0.7.0" \
+            "bluesky-darkframes>=0.6.0" \
+            caproto \
+            emojis \
+            happi \
+            pexpect \
+            "pyolog>=4.5.0" \
+            pyserial \
+            python-confluent-kafka \
+            pyzenodo3 \
+            simple-pid \
+            slack-sdk \
+            hklpy \
+            "hxnfly>=0.0.11" \
+            kkcalc \
+            ppmac \
+            "pychx>=4.3.1" \
+            "xpdacq==1.0.0" \
+            hunter \
+            logging_tree \
+            line_profiler \
+            pyinstrument \
+            pyperformance \
+            botorch \
+            gpytorch \
+            ortools-python \
+            pytorch \
+            scikit-optimize
+
       - name: Export files
         run: |
           set -vxeo pipefail

diff --git a/envs/env-py311.yml b/envs/env-py311.yml
@@ -203,36 +203,37 @@ dependencies:
   #            Dependencies from the `nsls2-collection` metapackage           #
   #                                                                           #
   #***************************************************************************#
-  - bloptools >=0.7.0
-  - bluesky-darkframes >=0.6.0
-  - caproto
-  - emojis
-  - happi
-  - pexpect
-  # - pydm
-  - pyolog >=4.5.0
-  - pyserial
-  - python-confluent-kafka
-  - pyzenodo3
-  - simple-pid
-  - slack-sdk
-  # Beamline-specific packages
-  - hklpy  # [linux]
-  - hxnfly >=0.0.11
-  - kkcalc
-  - ppmac
-  - pychx >=4.3.1
-  - xpdacq ==1.0.0
-  # Debugging tools:
-  - hunter
-  - logging_tree
-  # Profiling tools:
-  - line_profiler
-  - pyinstrument
-  - pyperformance
-  # ML:
-  - botorch
-  - gpytorch
-  - ortools-python
-  - pytorch
-  - scikit-optimize
+  # Those package will be added to the successfully-resolved conda env:
+  # - bloptools >=0.7.0
+  # - bluesky-darkframes >=0.6.0
+  # - caproto
+  # - emojis
+  # - happi
+  # - pexpect
+  # # - pydm
+  # - pyolog >=4.5.0
+  # - pyserial
+  # - python-confluent-kafka
+  # - pyzenodo3
+  # - simple-pid
+  # - slack-sdk
+  # # Beamline-specific packages
+  # - hklpy  # [linux]
+  # - hxnfly >=0.0.11
+  # - kkcalc
+  # - ppmac
+  # - pychx >=4.3.1
+  # - xpdacq ==1.0.0
+  # # Debugging tools:
+  # - hunter
+  # - logging_tree
+  # # Profiling tools:
+  # - line_profiler
+  # - pyinstrument
+  # - pyperformance
+  # # ML:
+  # - botorch
+  # - gpytorch
+  # - ortools-python
+  # - pytorch
+  # - scikit-optimize