Merge pull request #39 from nsls2-conda-envs/2024-2.2

2024-2.2 envs
nsls2-conda-envs · Jul 2, 2024 · 4285614 · 4285614
2 parents 6730425 + 5a12117
commit 4285614
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ default_language_version:
     python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
     - id: check-yaml
     - id: end-of-file-fixer

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: "2024-2.1-py310-tiled"
+env_name: "2024-2.2-py310-tiled"
 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: 2024-2.1-tiled
+    version: 2024-2.2-tiled
     creators:
       - name: Rakitin, Max
         affiliation: "Brookhaven National Laboratory"

diff --git a/configs/config-py311.yml b/configs/config-py311.yml
@@ -1,5 +1,5 @@
 docker_image: "quay.io/condaforge/linux-anvil-cos7-x86_64:latest"
-env_name: "2024-2.1-py311-tiled"
+env_name: "2024-2.2-py311-tiled"
 conda_env_file: "env-py311.yml"
 conda_binary: "mamba"
 python_version: "3.11"
@@ -19,7 +19,7 @@ zenodo_metadata:
     title: "NSLS-II collection conda environment"
     upload_type: "software"
     description: "NSLS-II collection conda environment"
-    version: 2024-2.1-tiled
+    version: 2024-2.2-tiled
     creators:
       - name: Rakitin, Max
         affiliation: "Brookhaven National Laboratory"

diff --git a/configs/config-py312.yml b/configs/config-py312.yml
@@ -1,5 +1,5 @@
 docker_image: "quay.io/condaforge/linux-anvil-cos7-x86_64:latest"
-env_name: "2024-2.1-py312-tiled"
+env_name: "2024-2.2-py312-tiled"
 conda_env_file: "env-py312.yml"
 conda_binary: "mamba"
 python_version: "3.12"
@@ -19,7 +19,7 @@ zenodo_metadata:
     title: "NSLS-II collection conda environment"
     upload_type: "software"
     description: "NSLS-II collection conda environment"
-    version: 2024-2.1-tiled
+    version: 2024-2.2-tiled
     creators:
       - name: Rakitin, Max
         affiliation: "Brookhaven National Laboratory"

diff --git a/envs/env-py310.yml b/envs/env-py310.yml
@@ -1,4 +1,4 @@
-name: 2024-2.1-py310-tiled
+name: 2024-2.2-py310-tiled
 channels:
   - conda-forge
 dependencies:
@@ -15,6 +15,7 @@ dependencies:
   - hdf5-external-filter-plugins
   - maggma >=0.66
   - mp-api >=0.41.2
+  - pychx >=4.3.1
   - pyfai >=2024.5.0
   - pymatgen >=2024.5.1
   - pyobjcryst
@@ -675,7 +676,6 @@ dependencies:
   - pybtex=0.24.0=pyhd8ed1ab_2
   - pycairo=1.25.0=py310hda9f760_1
   - pycentroids=0.2.0rc3=py310hc6cd4ac_0
-  - pychx=4.2.0=pyhd8ed1ab_0
   - pycifrw=4.4.6=py310h2372a71_1
   - pycodestyle=2.11.1=pyhd8ed1ab_0
   - pyconify=0.1.6=pyhd8ed1ab_0

diff --git a/envs/env-py311.yml b/envs/env-py311.yml
@@ -1,4 +1,4 @@
-name: 2024-2.1-py311-tiled
+name: 2024-2.2-py311-tiled
 channels:
   - conda-forge
 dependencies:
@@ -217,7 +217,7 @@ dependencies:
   - hxnfly >=0.0.11
   - kkcalc
   - ppmac
-  - pychx >=4.3.0
+  - pychx >=4.3.1
   - xpdacq ==1.0.0
   # Debugging tools:
   - hunter

diff --git a/envs/env-py312.yml b/envs/env-py312.yml
@@ -1,4 +1,4 @@
-name: 2024-2.1-py312-tiled
+name: 2024-2.2-py312-tiled
 channels:
   - conda-forge
 dependencies:
@@ -218,7 +218,7 @@ dependencies:
   - hxnfly >=0.0.11
   - kkcalc
   - ppmac
-  - pychx >=4.3.0
+  - pychx >=4.3.1
   - xpdacq ==1.0.0
   # Debugging tools:
   - hunter