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

2023-2.1 py310 env (attempt 2)
nsls2-conda-envs · Jun 29, 2023 · 99cf518 · 99cf518
2 parents 14e06f0 + 48c1949
commit 99cf518
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -10,15 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        # python-version: ["3.9", "3.10"]
         python-version: ["3.10"]
       fail-fast: false
     env:
       TZ: America/New_York
 
+    defaults:
+      run:
+        shell: bash -l {0}
+
     steps:
       - name: Set env vars
-        shell: bash -l {0}
         run: |
           export REPOSITORY_NAME=${GITHUB_REPOSITORY#*/}  # just the repo, as opposed to org/repo
           echo "REPOSITORY_NAME=${REPOSITORY_NAME}" >> $GITHUB_ENV
@@ -27,7 +29,6 @@ jobs:
           echo "DATETIME_STRING=${DATETIME_STRING}" >> $GITHUB_ENV
 
       - name: Set non-secret environment variables
-        shell: bash -l {0}
         run: |
           export PYTHONVER=$(echo ${{ matrix.python-version }} | sed 's/\.//g')
           echo "PYTHONVER=${PYTHONVER}" >> $GITHUB_ENV
@@ -36,7 +37,7 @@ jobs:
           echo "CONDA_PACK_TEMPLATE_DIR=${CONDA_PACK_TEMPLATE_DIR}" >> $GITHUB_ENV
 
       - name: checkout the code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: checkout NSLS-II/conda-pack-template
         run: |
@@ -51,7 +52,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: pip-install dependencies
-        shell: bash -l {0}
         run: |
           # For reference: https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html.
           set -vxeuo pipefail
@@ -65,7 +65,6 @@ jobs:
           python3 -m pip install -r ${CONDA_PACK_TEMPLATE_DIR}/requirements-dev.txt
 
       - name: check env
-        shell: bash -l {0}
         run: |
           # For reference: https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html.
           set -vxeuo pipefail
@@ -78,7 +77,6 @@ jobs:
           printenv | sort
 
       - name: render config
-        shell: bash -l {0}
         run: |
           # For reference: https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html.
           set -vxeuo pipefail
@@ -99,10 +97,9 @@ jobs:
           echo "CONDA_PACK_TEMPLATE_RUNNER=${CONDA_PACK_TEMPLATE_RUNNER}" >> $GITHUB_ENV
 
       - name: run a build with Docker/Podman
-        shell: bash -l {0}
         run: |
           # For reference: https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html.
-          set -vxeuo pipefail
+          set -vxeo pipefail
           cp -v ${CONDA_PACK_TEMPLATE_DIR}/export.sh .
           bash ${CONDA_PACK_TEMPLATE_RUNNER}
           ls -laF
@@ -111,12 +108,10 @@ jobs:
           ls -laF artifacts/
 
       - name: contents of the env .yml file
-        shell: bash -l {0}
         run: |
           cat artifacts/${CONDA_PACK_ENV_NAME}.yml
 
       - name: checksum files
-        shell: bash -l {0}
         run: |
           cat artifacts/*sum.txt
 

diff --git a/envs/env-py310.yml b/envs/env-py310.yml
@@ -15,13 +15,13 @@ dependencies:
   - attrs >=18.0
   - awkward
   - black
-  - bluesky >=1.10.0
+  - bluesky >=1.11.0
   - bluesky-adaptive >=0.3.1
   - bluesky-kafka >=0.10.0
   - bluesky-live >=0.0.8
-  - bluesky-queueserver >=0.0.18
-  - bluesky-queueserver-api >=0.0.9
-  - bluesky-widgets >=0.0.14
+  - bluesky-queueserver >=0.0.19
+  - bluesky-queueserver-api >=0.0.10
+  - bluesky-widgets >=0.0.15
   - boto3
   - chxtools
   - cmasher
@@ -77,14 +77,14 @@ dependencies:
   - netcdf4
   - nexpy >=0.14.8
   - nodejs
-  - nsls2-detector-handlers >=0.0.2
+  - nsls2-detector-handlers >=0.0.3
   - nslsii >=0.9.1
   - numexpr
   - numpy >=1.20
   - nyxtools >=0.0.12
   - oct2py
   - opencv
-  - ophyd >=1.7.0
+  - ophyd >=1.8.0
   # pandas and deps
   - pandas
   - openpyxl  # used by pandas .to_excel()
@@ -104,6 +104,7 @@ dependencies:
   - pyepics >=3.4.2
   - pyfai
   - pyfftw
+  - pymatgen >=2023.6.28
   - pymca
   - pymcr
   - pymongo >=3.7
@@ -148,9 +149,9 @@ dependencies:
   - zbar  # dependency of pyzbar
   # Simulation packages:
   - oscars
-  - shadow3
-  - srwpy
-  - sirepo-bluesky
+  - shadow3 >=23.1.4
+  - srwpy >=4.0.0b1
+  - sirepo-bluesky >=0.6.2
   - xrt
   #***************************************************************************#
   #                                                                           #