The package lists for py311 and py312 are close to each other

nsls2-conda-envs · Oct 30, 2024 · 3afcf82 · 3afcf82
1 parent 40daf43
commit 3afcf82
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 70 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -84,38 +84,38 @@ 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: 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: |

diff --git a/envs/env-py311.yml b/envs/env-py311.yml
@@ -11,7 +11,7 @@ dependencies:
   - algotom
   - amostra <=1.0
   - analysisstore >=0.0.6
-  - ansiwrap
+  # - ansiwrap
   - area-detector-handlers >=0.0.9
   - arvpyf
   - attrs >=18.0
@@ -184,15 +184,17 @@ dependencies:
   - zbar  # dependency of pyzbar
   # Simulation packages:
   - oscars
-  - shadow3 >=23.1.4
+  # - shadow3 >=23.1.4
   - srwpy >=4.1.0
-  - sirepo-bluesky >=0.6.2
+  # - sirepo-bluesky >=0.6.2
   - xrt
   - zict
   - pipx
   - pip
   - pip:
+    - ansiwrap
     - bluesky >=1.13.0a3
+    - bloptools >=0.7.0
     - digautoprofiler
     - mimesis
     - ophyd-async[ca,pva]
@@ -204,37 +206,35 @@ dependencies:
   #            Dependencies from the `nsls2-collection` metapackage           #
   #                                                                           #
   #***************************************************************************#
-  # 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
+  - 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
+  - pytorch
+  - scikit-optimize
diff --git a/envs/env-py312.yml b/envs/env-py312.yml
@@ -45,7 +45,7 @@ dependencies:
   - databroker >=2.0.0b45
   - dictdiffer
   - diffpy.pdffit2
-  # - diffpy.pdfgui  # no package for py312
+  - diffpy.pdfgui
   - diffpy.structure
   - discorpy
   - distributed
@@ -128,7 +128,7 @@ dependencies:
   - pycryptodome
   - pyepics >=3.4.2
   - pyfai >=2024.5.0
-  # - pyfftw  # no build for py312 as of 2024-06-20
+  - pyfftw
   - pymatgen >=2024.5.1
   - maggma >=0.66
   - mp-api >=0.41.2