Merge pull request #20 from nsls2-conda-envs/2023-2.0

2023-2.0-py310 env
nsls2-conda-envs · Apr 27, 2023 · c796f7c · c796f7c
2 parents 2a60437 + b0fd5b0
commit c796f7c
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -10,7 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.9", "3.10"]
+        # python-version: ["3.9", "3.10"]
+        python-version: ["3.10"]
       fail-fast: false
     env:
       TZ: America/New_York

diff --git a/configs/config-py39.yml → configs/archive/config-py39.yml b/configs/config-py39.yml → configs/archive/config-py39.yml
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-1.3-py310"
+env_name: "2023-2.0-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-1.3
+    version: 2023-2.0
     creators:
       - name: Rakitin, Maksim
         affiliation: "Brookhaven National Laboratory"

diff --git a/envs/env-py39.yml → envs/archive/env-py39.yml b/envs/env-py39.yml → envs/archive/env-py39.yml
diff --git a/envs/env-py310.yml b/envs/env-py310.yml
@@ -1,4 +1,4 @@
-name: 2023-1.3-py310
+name: 2023-2.0-py310
 channels:
   - conda-forge
 dependencies:
@@ -13,8 +13,10 @@ dependencies:
   - area-detector-handlers >=0.0.9
   - arvpyf
   - attrs >=18.0
+  - awkward
   - black
   - bluesky >=1.10.0
+  - bluesky-adaptive >=0.3.1
   - bluesky-kafka >=0.10.0
   - bluesky-live >=0.0.8
   - bluesky-queueserver >=0.0.18
@@ -36,7 +38,7 @@ dependencies:
   - dpcmaps
   - edrixs
   - eiger-io
-  - event-model >=1.19.1
+  - event-model >=1.19.2
   - fabio
   - ffmpeg >=4.0
   - flake8
@@ -48,7 +50,7 @@ dependencies:
   - hdf5-external-filter-plugins-lz4
   - hxntools >=0.6.1
   - igor
-  - imageio <2.16.2
+  - imageio
   - inflection
   - intake <=0.6.4
   - ipykernel
@@ -69,7 +71,7 @@ dependencies:
   - memory_profiler
   - mendeleev
   - modestimage
-  - mxtools >=1.0.2
+  - mxtools >=1.0.3
   - napari >=0.4.17
   - natsort
   - netcdf4
@@ -154,7 +156,7 @@ dependencies:
   #            Dependencies from the `nsls2-collection` metapackage           #
   #                                                                           #
   #***************************************************************************#
-  - bloptools
+  - bloptools >=0.2.0
   - bluesky-darkframes
   - caproto
   - happi