From c51fa20e4df56a1a44bee67a3a305e41031b9cb1 Mon Sep 17 00:00:00 2001 From: Maksim Rakitin Date: Wed, 31 Jul 2024 15:10:58 -0400 Subject: [PATCH] Move some packages to a separate installation step --- .github/workflows/package.yml | 33 +++++++++++++++++ envs/env-py311.yml | 67 ++++++++++++++++++----------------- 2 files changed, 67 insertions(+), 33 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index d0decbb..6ab5b1d 100644 --- 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 index ca77b55..3dbe25c 100644 --- 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