Merge pull request #21 from nsls2-conda-envs/2023-2.1

2023-2.1 py310 env
nsls2-conda-envs · Jun 21, 2023 · 14e06f0 · 14e06f0
2 parents c796f7c + 7e8bbf9
commit 14e06f0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -128,7 +128,7 @@ jobs:
         with:
           name: test-${{ env.CONDA_PACK_ENV_NAME }}-${{ env.DATETIME_STRING }}
           path: artifacts
-          retention-days: 7
+          retention-days: 14
 
       - name: upload artifacts for release
         if: |
@@ -137,11 +137,11 @@ jobs:
         with:
           name: ${{ env.CONDA_PACK_ENV_NAME }}
           path: artifacts
-          retention-days: 30
+          retention-days: 60
 
       - name: upload artifacts for the env .yml file
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.CONDA_PACK_ENV_NAME }}.yml
           path: artifacts/${{ env.CONDA_PACK_ENV_NAME}}.yml
-          retention-days: 30
+          retention-days: 60
diff --git a/configs/config-py310.yml b/configs/config-py310.yml
@@ -1,5 +1,5 @@
 docker_image: "quay.io/condaforge/linux-anvil-cos7-x86_64:latest"
-env_name: "2023-2.0-py310"
+env_name: "2023-2.1-py310"
 conda_env_file: "env-py310.yml"
 conda_binary: "mamba"
 python_version: "3.10"
@@ -19,7 +19,7 @@ zenodo_metadata:
     title: "NSLS-II collection conda environment"
     upload_type: "software"
     description: "NSLS-II collection conda environment"
-    version: 2023-2.0
+    version: 2023-2.1
     creators:
       - name: Rakitin, Maksim
         affiliation: "Brookhaven National Laboratory"

diff --git a/envs/env-py310.yml b/envs/env-py310.yml
@@ -1,4 +1,4 @@
-name: 2023-2.0-py310
+name: 2023-2.1-py310
 channels:
   - conda-forge
 dependencies:
@@ -26,7 +26,7 @@ dependencies:
   - chxtools
   - cmasher
   - conda-pack
-  - csxtools >=0.1.18
+  - csxtools >=0.2
   - dash
   - dash-bootstrap-components
   - dask
@@ -78,7 +78,7 @@ dependencies:
   - nexpy >=0.14.8
   - nodejs
   - nsls2-detector-handlers >=0.0.2
-  - nslsii >=0.9.0
+  - nslsii >=0.9.1
   - numexpr
   - numpy >=1.20
   - nyxtools >=0.0.12
@@ -150,15 +150,17 @@ dependencies:
   - oscars
   - shadow3
   - srwpy
+  - sirepo-bluesky
   - xrt
   #***************************************************************************#
   #                                                                           #
   #            Dependencies from the `nsls2-collection` metapackage           #
   #                                                                           #
   #***************************************************************************#
-  - bloptools >=0.2.0
-  - bluesky-darkframes
+  - bloptools >=0.3.0
+  - bluesky-darkframes >=0.6.0
   - caproto
+  - emojis
   - happi
   - pexpect
   # - pydm
@@ -171,7 +173,9 @@ dependencies:
   # Beamline-specific packages
   - hklpy  # [linux]
   - hxnfly >=0.0.11
+  - kkcalc
   - ppmac
+  - pychx >=4.1.2
   - xpdacq >=1.1.4
   # Debugging tools:
   - hunter